Skip to content

add uiscale patch #501

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

Closed
gajop wants to merge 1 commit into from
Closed

add uiscale patch #501

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
17 changes: 15 additions & 2 deletions libs/chiliui/luamenu/chili/chili/controls/font.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Font = Object:Inherit{
color = {1, 1, 1, 1},
outlineColor = {0, 0, 0, 1},
autoOutlineColor = true,

uiScale = 1
}

local this = Font
Expand All @@ -35,6 +37,7 @@ local inherited = this.inherited

function Font:New(obj)
obj = inherited.New(self, obj)
obj.uiScale = (WG and WG.uiScale or 1)

--// Load the font
obj:_LoadFont()
Expand All @@ -54,7 +57,7 @@ end

function Font:_LoadFont()
local oldfont = self._font
self._font = FontHandler.LoadFont(self.font, self.size, self.outlineWidth, self.outlineWeight)
self._font = FontHandler.LoadFont(self.font, math.floor(self.size*self.uiScale*2), math.floor(self.outlineWidth*self.uiScale*2), self.outlineWeight)
--// do this after LoadFont because it can happen that LoadFont returns the same font again
--// but if we Unload our old one before, the gc could collect it before, so the engine would have to reload it again
FontHandler.UnloadFont(oldfont)
Expand Down Expand Up @@ -250,7 +253,15 @@ end

--// =============================================================================

function Font:CheckUiScaleChange()
if (WG and WG.uiScale or 1) ~= self.uiScale then
self.uiScale = (WG and WG.uiScale or 1)
self:_LoadFont()
end
end

function Font:_DrawText(text, x, y, extra)
self:CheckUiScaleChange()
local font = self._font

gl.PushAttrib(GL.COLOR_BUFFER_BIT)
Expand All @@ -271,6 +282,7 @@ end


function Font:Draw(text, x, y, align, valign)
self:CheckUiScaleChange()
if (not text) then
return
end
Expand All @@ -287,6 +299,7 @@ end


function Font:DrawInBox(text, x, y, w, h, align, valign)
self:CheckUiScaleChange()
if (not text) then
return
end
Expand All @@ -307,4 +320,4 @@ end
Font.Print = Font.Draw
Font.PrintInBox = Font.DrawInBox

--// =============================================================================
--// =============================================================================