openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Pick the largest suitable default scale. Fix #468 (#472)

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-11-19 18:17:15 -06:00
committed by GitHub
parent a725dc606a
commit 9d972a3961
19 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dialogxml/dialogs/dialog.cpp
View File

@@ -460,8 +460,8 @@ void cDialog::recalcRect(){
}
}
winRect.right *= ui_scale();
winRect.bottom *= ui_scale();
winRect.right *= get_ui_scale();
winRect.bottom *= get_ui_scale();
}
bool cDialog::initCalled = false;
@@ -719,7 +719,7 @@ void cDialog::handle_one_event(const sf::Event& currentEvent, cFramerateLimiter&
break;
case sf::Event::MouseButtonPressed:
key.mod = current_key_mod();
where = {(int)(currentEvent.mouseButton.x / ui_scale()), (int)(currentEvent.mouseButton.y / ui_scale())};
where = {(int)(currentEvent.mouseButton.x / get_ui_scale()), (int)(currentEvent.mouseButton.y / get_ui_scale())};
process_click(where, key.mod, fps_limiter);
break;
default: // To silence warning of unhandled enum values
@@ -1076,7 +1076,7 @@ void cDialog::draw(){
// Scale dialogs:
sf::View view = win.getDefaultView();
view.setViewport(sf::FloatRect(0, 0, ui_scale(), ui_scale()));
view.setViewport(sf::FloatRect(0, 0, get_ui_scale(), get_ui_scale()));
win.setView(view);
ctrlIter iter = controls.begin();

1
src/dialogxml/dialogs/dialog.hpp
View File

@@ -261,7 +261,6 @@ public:
cDialog& operator=(cDialog& other) = delete;
cDialog(cDialog& other) = delete;
private:
inline double ui_scale() { return get_float_pref("UIScale", 1.0); };
void draw();
void handle_events();
void handle_one_event(const sf::Event&, cFramerateLimiter& fps_limiter);