Skip to content

Add missing screen size conversions #9373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meehl wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add missing screen size conversions #9373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Launch.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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, ...)
Expand Down
11 changes: 11 additions & 0 deletions src/Modules/Common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,3 +963,14 @@ function ImportBuild(importLink, callback)
callback(Inflate(common.base64.decode(importLink:gsub("-", "+"):gsub("_", "/"))), nil)
end
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
7 changes: 1 addition & 6 deletions src/Modules/Main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down