[WIP] UI scale #3159
Draft
[WIP] UI scale #3159
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3f4d228 to
1aceaa1
Compare
Currently this is quite blurry, and the pick hospital screen is broken.
When the cursor isn't drawn, e.g. the choose theme hospital directory screen, it was in completely the wrong position. This fixes that by compensating the cursor position. There are still some gaps in game_ui, but the main menu and settings screens are working well.
Scale panel sprites because that can't be helped. Scale UIResizable, buttons, and panels Scale some text drawing - though I will likely replace that with a draw argument later.
Use scale factor instead of canvas scale for window label text. The visual difference with TTF fonts is very clear. Yey HiDPI.
Use that instead of canvas:scale for panel sprites
Instead of storing the scaled height and width as state store whether the Window / Panel is using scale independent pixels. If so perform the adjustment in the draw/hitTest functions. The goal is to avoid mixing scale information into the save state in ways that will be hard to deal with. Some regression here, mainly tooltips are not functioning
Improve hit tests / hover
Include fix for line width
Was redundant to UIResizable code.
Add the ability to specify flags when loading a bitmap. This is needed because linear scaling causes artifacts at the border where the face is composed of multiple images.
CorsixTH/Src/th_lua_gfx.cpp
Outdated
| #include FT_TYPES_H | ||
|
|
||
| namespace { | ||
| uint32_t flags_from_table(lua_State* L, int index) { |
Contributor
There was a problem hiding this comment.
Are you aware that the draw flags also exist as named constants in Lua?
Lua/utility.lua
217:DrawFlags = {}
218:DrawFlags.FlipHorizontal = 2^0
219:DrawFlags.FlipVertical = 2^1
220:DrawFlags.Alpha50 = 2^2
221:DrawFlags.Alpha75 = 2^3
222:DrawFlags.AltPalette = 2^4
223:DrawFlags.EarlyList = 2^10
224:DrawFlags.ListBottom = 2^11
225:DrawFlags.BoundBoxHitTest = 2^12
226:DrawFlags.Crop = 2^13
utility also has a number of bit operation functions (flag_* functions around lines 190-210, and two more around lines 295-310)
Member
Author
There was a problem hiding this comment.
I didn't, I'll switch to using those and add the missing flags.
Fonts and graphics need to be reloaded when the flags changed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1210
...