Desktop version gui scaling restored
This commit is contained in:
parent
40688176d9
commit
c4005da3c9
8 changed files with 18 additions and 5 deletions
|
|
@ -94,3 +94,9 @@ void DesktopDrawingProgramScreen::on_tab_close() {
|
|||
else
|
||||
main.switch_to_tab(0);
|
||||
}
|
||||
|
||||
float DesktopDrawingProgramScreen::calculate_gui_scale() {
|
||||
Vector2f maxWindowSizeBeforeForcedFit = main.g.final_gui_scale_not_fit() * Vector2f{700.0f, 700.0f};
|
||||
Vector2f fitRatio = {main.window.size.x() / maxWindowSizeBeforeForcedFit.x(), main.window.size.y() / maxWindowSizeBeforeForcedFit.y()};
|
||||
return main.g.final_gui_scale_not_fit() * std::min(std::min(fitRatio.x(), fitRatio.y()), 1.0f);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ class DesktopDrawingProgramScreen : public DrawingProgramScreen {
|
|||
virtual void input_text_key_callback(const InputManager::KeyCallbackArgs& key) override;
|
||||
virtual void open_file_selector(const std::string& filePickerName, const std::vector<ExtensionFilter>& extensionFilters, OpenFileSelectorCallback postSelectionFunc, const std::string& fileName = "", bool isSaving = false) override;
|
||||
virtual void on_tab_close() override;
|
||||
virtual float calculate_gui_scale() override;
|
||||
|
||||
private:
|
||||
Toolbar toolbar;
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@ void Screen::input_window_scale_callback(const InputManager::WindowScaleCallback
|
|||
void Screen::input_app_about_to_go_to_background_callback() {}
|
||||
void Screen::input_app_about_to_go_to_foreground_callback() {}
|
||||
void Screen::on_tab_close() {}
|
||||
float Screen::calculate_gui_scale() { return main.g.final_gui_scale_not_fit(); }
|
||||
std::optional<InputManager::TextBoxStartInfo> Screen::get_text_box_start_info() { return std::nullopt; }
|
||||
|
||||
Screen::~Screen() {}
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@ class Screen {
|
|||
virtual void input_window_scale_callback(const InputManager::WindowScaleCallbackArgs& w);
|
||||
virtual void input_app_about_to_go_to_background_callback();
|
||||
virtual void input_app_about_to_go_to_foreground_callback();
|
||||
virtual float calculate_gui_scale();
|
||||
virtual void on_tab_close();
|
||||
virtual std::optional<InputManager::TextBoxStartInfo> get_text_box_start_info();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue