diff --git a/src/Export/Launch.lua b/src/Export/Launch.lua index 7a3496e08..47878cc40 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 = GetScreenSize() + local screenW, screenH = GetVirtualScreenSize() 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 = GetScreenSize() + local screenW, screenH = GetVirtualScreenSize() 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 ceebf7703..f3cf115b2 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 = GetScreenSize() + self.screenW, self.screenH = GetVirtualScreenSize() self.viewPort = { x = 0, y = 0, width = self.screenW, height = self.screenH } diff --git a/src/Launch.lua b/src/Launch.lua index dffeb8307..2d5305cd5 100644 --- a/src/Launch.lua +++ b/src/Launch.lua @@ -122,7 +122,7 @@ function launch:OnFrame() self:DrawPopup(r, g, b, "^0%s", self.promptMsg) end if self.doRestart then - local screenW, screenH = GetScreenSize() + local screenW, screenH = GetVirtualScreenSize() 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 = GetScreenSize() + local screenW, screenH = GetVirtualScreenSize() 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 9dfc78ca1..6e532828a 100644 --- a/src/Modules/Common.lua +++ b/src/Modules/Common.lua @@ -1038,4 +1038,15 @@ 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 4ff060d7c..9905923bb 100644 --- a/src/Modules/Main.lua +++ b/src/Modules/Main.lua @@ -339,12 +339,7 @@ function main:Shutdown() end function main:OnFrame() - self.screenW, self.screenH = GetScreenSize() - self.screenScale = GetScreenScale and GetScreenScale() or 1 - if self.screenScale ~= 1.0 then - self.screenW = math.floor(self.screenW / self.screenScale) - self.screenH = math.floor(self.screenH / self.screenScale) - end + self.screenW, self.screenH = GetVirtualScreenSize() if self.screenH > self.screenW then self.portraitMode = true