diff --git a/runtime/SimpleGraphic.dll b/runtime/SimpleGraphic.dll index 433217931d..d376900af7 100644 Binary files a/runtime/SimpleGraphic.dll and b/runtime/SimpleGraphic.dll differ diff --git a/runtime/abseil_dll.dll b/runtime/abseil_dll.dll index 548b5ee599..fe16b771f8 100644 Binary files a/runtime/abseil_dll.dll and b/runtime/abseil_dll.dll differ diff --git a/runtime/fmt.dll b/runtime/fmt.dll index ae7fd329df..05235c6892 100644 Binary files a/runtime/fmt.dll and b/runtime/fmt.dll differ diff --git a/runtime/glfw3.dll b/runtime/glfw3.dll index 666f74f413..fe961880b4 100644 Binary files a/runtime/glfw3.dll and b/runtime/glfw3.dll differ diff --git a/runtime/lcurl.dll b/runtime/lcurl.dll index 6566b5146d..65fb097dd7 100644 Binary files a/runtime/lcurl.dll and b/runtime/lcurl.dll differ diff --git a/runtime/libEGL.dll b/runtime/libEGL.dll index 0c786803f3..1d099b98d6 100644 Binary files a/runtime/libEGL.dll and b/runtime/libEGL.dll differ diff --git a/runtime/libGLESv2.dll b/runtime/libGLESv2.dll index d4abc82ce5..a19b7f0e07 100644 Binary files a/runtime/libGLESv2.dll and b/runtime/libGLESv2.dll differ diff --git a/runtime/libcurl.dll b/runtime/libcurl.dll index 0bb4ee9c0d..abe199ccdc 100644 Binary files a/runtime/libcurl.dll and b/runtime/libcurl.dll differ diff --git a/runtime/libwebpdecoder.dll b/runtime/libwebpdecoder.dll index c1f821fdb2..dc612bcba9 100644 Binary files a/runtime/libwebpdecoder.dll and b/runtime/libwebpdecoder.dll differ diff --git a/runtime/lua-utf8.dll b/runtime/lua-utf8.dll index 82aceace18..eda1187556 100644 Binary files a/runtime/lua-utf8.dll and b/runtime/lua-utf8.dll differ diff --git a/runtime/lua51.dll b/runtime/lua51.dll index 9b3c6a665f..af30442543 100644 Binary files a/runtime/lua51.dll and b/runtime/lua51.dll differ diff --git a/runtime/lzip.dll b/runtime/lzip.dll index a4353d4f3a..da31eea2c2 100644 Binary files a/runtime/lzip.dll and b/runtime/lzip.dll differ diff --git a/runtime/re2.dll b/runtime/re2.dll index 605877a3b8..2f36193833 100644 Binary files a/runtime/re2.dll and b/runtime/re2.dll differ diff --git a/runtime/socket.dll b/runtime/socket.dll index 529f92aa1a..2266416793 100644 Binary files a/runtime/socket.dll and b/runtime/socket.dll differ diff --git a/runtime/zlib1.dll b/runtime/zlib1.dll index 82b49f5a82..2d9e268a11 100644 Binary files a/runtime/zlib1.dll and b/runtime/zlib1.dll differ diff --git a/runtime/zstd.dll b/runtime/zstd.dll index 015060eaff..43bf67a96b 100644 Binary files a/runtime/zstd.dll and b/runtime/zstd.dll differ diff --git a/src/Export/Launch.lua b/src/Export/Launch.lua index 47878cc401..7a3496e08f 100644 --- a/src/Export/Launch.lua +++ b/src/Export/Launch.lua @@ -67,7 +67,7 @@ function launch:OnFrame() self:DrawPopup(r, g, b, "^0%s", self.promptMsg) end if self.doRestart then - local screenW, screenH = GetVirtualScreenSize() + local screenW, screenH = GetScreenSize() SetDrawColor(0, 0, 0, 0.75) DrawImage(nil, 0, 0, screenW, screenH) SetDrawColor(1, 1, 1) @@ -180,7 +180,7 @@ function launch:RunPromptFunc(key) end function launch:DrawPopup(r, g, b, fmt, ...) - local screenW, screenH = GetVirtualScreenSize() + local screenW, screenH = GetScreenSize() SetDrawColor(0, 0, 0, 0.5) DrawImage(nil, 0, 0, screenW, screenH) local txt = string.format(fmt, ...) diff --git a/src/Export/Main.lua b/src/Export/Main.lua index 98360a6968..7c8591ee3d 100644 --- a/src/Export/Main.lua +++ b/src/Export/Main.lua @@ -416,7 +416,7 @@ function main:Shutdown() end function main:OnFrame() - self.screenW, self.screenH = GetVirtualScreenSize() + self.screenW, self.screenH = GetScreenSize() self.viewPort = { x = 0, y = 0, width = self.screenW, height = self.screenH } diff --git a/src/HeadlessWrapper.lua b/src/HeadlessWrapper.lua index 2b391a68b9..db8bd58073 100644 --- a/src/HeadlessWrapper.lua +++ b/src/HeadlessWrapper.lua @@ -51,9 +51,6 @@ end function GetScreenScale() return 1 end -function GetVirtualScreenSize() - return GetScreenSize() -end function GetDPIScaleOverridePercent() return 1 end diff --git a/src/Launch.lua b/src/Launch.lua index 2d5305cd5c..8ef85902ea 100644 --- a/src/Launch.lua +++ b/src/Launch.lua @@ -65,7 +65,7 @@ function launch:OnInit() self.installedMode = true installedFile:close() end - RenderInit("DPI_AWARE") + RenderInit() ConPrintf("Loading main script...") local errMsg errMsg, self.main = PLoadModule("Modules/Main") @@ -122,7 +122,7 @@ function launch:OnFrame() self:DrawPopup(r, g, b, "^0%s", self.promptMsg) end if self.doRestart then - local screenW, screenH = GetVirtualScreenSize() + local screenW, screenH = GetScreenSize() SetDrawColor(0, 0, 0, 0.75) DrawImage(nil, 0, 0, screenW, screenH) SetDrawColor(1, 1, 1) @@ -387,7 +387,7 @@ function launch:RunPromptFunc(key) end function launch:DrawPopup(r, g, b, fmt, ...) - local screenW, screenH = GetVirtualScreenSize() + local screenW, screenH = GetScreenSize() SetDrawColor(0, 0, 0, 0.5) DrawImage(nil, 0, 0, screenW, screenH) local txt = string.format(fmt, ...) diff --git a/src/Modules/Common.lua b/src/Modules/Common.lua index 6e532828ad..9dfc78ca1b 100644 --- a/src/Modules/Common.lua +++ b/src/Modules/Common.lua @@ -1038,15 +1038,4 @@ end function getHashFromString(string) return common.sha1(string) -end - --- Returns virtual screen size -function GetVirtualScreenSize() - local width, height = GetScreenSize() - local scale = GetScreenScale and GetScreenScale() or 1.0 - if scale ~= 1.0 then - width = math.floor(width / scale) - height = math.floor(height / scale) - end - return width, height end \ No newline at end of file diff --git a/src/Modules/Main.lua b/src/Modules/Main.lua index 9958b2a000..a220e29e4d 100644 --- a/src/Modules/Main.lua +++ b/src/Modules/Main.lua @@ -341,7 +341,7 @@ function main:Shutdown() end function main:OnFrame() - self.screenW, self.screenH = GetVirtualScreenSize() + self.screenW, self.screenH = GetScreenSize() if self.screenH > self.screenW then self.portraitMode = true