From 2d2af972a53a2c11b95469058803b4eaed2d3c01 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Nov 2021 22:35:48 +0100 Subject: [PATCH] Extract dpi_scale_factor() to a function. --- src/wx/film_viewer.cc | 10 +++------- src/wx/wx_util.cc | 15 +++++++++++++++ src/wx/wx_util.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 392c68d70..259e2bc16 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -283,13 +283,9 @@ FilmViewer::calculate_sizes () auto const container = _film->container (); -#if wxCHECK_VERSION(3,1,0) - auto const dpi_scale_factor = _video_view->get()->GetDPIScaleFactor(); -#else - auto const dpi_scale_factor = 1; -#endif - int const video_view_width = std::round(_video_view->get()->GetSize().x * dpi_scale_factor); - int const video_view_height = std::round(_video_view->get()->GetSize().y * dpi_scale_factor); + auto const scale = dpi_scale_factor (_video_view->get()); + int const video_view_width = std::round(_video_view->get()->GetSize().x * scale); + int const video_view_height = std::round(_video_view->get()->GetSize().y * scale); auto const view_ratio = float(video_view_width) / video_view_height; auto const film_ratio = container ? container->ratio () : 1.78; diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index a0beb8f72..47a6bd5b0 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -673,3 +673,18 @@ gui_is_dark () #endif } + +#if wxCHECK_VERSION(3,1,0) +double +dpi_scale_factor (wxWindow* window) +{ + return window->GetDPIScaleFactor(); +} +#else +double +dpi_scale_factor (wxWindow*) +{ + return 1; +} +#endif + diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 585a30611..30e2b739a 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -120,6 +120,7 @@ extern bool report_errors_from_last_job (wxWindow* parent); extern wxString bitmap_path (std::string name); extern wxSize small_button_size (wxWindow* parent, wxString text); extern bool gui_is_dark (); +extern double dpi_scale_factor (wxWindow* window); struct Offset -- 2.30.2