Fix UI scaling #592
Merged
Fix UI scaling #592
Conversation
This file contains 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
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
fix a bunch of ui rendering bugs caused by new scaling code fix main menu timing code Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
| @@ -399,10 +417,13 @@ int initApp(char const * const title, int fullscreen) | |||
| } | |||
|
|
|||
| // create player classes | |||
| // TODO/FIXME: why isn't this in initGame? why is it in init.cpp? | |||
There was a problem hiding this comment.
This was to not crash on frames checking for the mouse in the loading screen (caught this in debug)
There was a problem hiding this comment.
I see, this PR changes the UI code so it reads mousex/mousey etc variables directly when EDITOR is defined (so it doesn't crash). ergo this can probably go in initGame() now
There was a problem hiding this comment.
I think it was crashing the main game, not editor
src/ui/GameUI.cpp
Outdated
| @@ -715,7 +715,7 @@ void createInventoryTooltipFrame(const int player) | |||
| auto tooltipTextField = tooltipFrame->addField("inventory mouse tooltip header", 1024); | |||
| tooltipTextField->setText("Nothing"); | |||
| tooltipTextField->setSize(SDL_Rect{ 0, 0, 0, 0 }); | |||
| tooltipTextField->setFont("fonts/pixelmix.ttf#14"); | |||
| tooltipTextField->setFont("fonts/pixelmix.ttf#16"); | |||
There was a problem hiding this comment.
Could you revert these font size changes for my HUD stuff - I'll need to redo the spacing/layout and want the old sizes for reference.
fix credits scroll rate Text.cpp: SDL_BlitScaled not used if resolution == 1 Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
SheridanR
force-pushed
the
fix-ui-scaling
branch
from
3ce6839 to
3e7e687
Compare
/res command changes window size Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Signed-off-by: SheridanR <sheridan.rathbun@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
UI is now rendered to its own framebuffer (render-to-texture) then drawn on a fullscreen quad to fix seams between ui elements at non-720p resolutions.
Also unlocks Frame::process() from the original tickrate which was 50.