Merge branch 'master' into wip/master

Author: Tom Seddon

src/b2/BeebWindow.cpp

@@ -3599,7 +3599,7 @@ bool BeebWindow::InitInternal() {
 #else
     bool imgui_enable_test_engine = false;
 #endif
-    m_imgui_stuff = new ImGuiStuff(m_renderer, imgui_enable_test_engine, display_size_x, display_size_y);
+    m_imgui_stuff = new ImGuiStuff(m_window, m_renderer, imgui_enable_test_engine, display_size_x, display_size_y);
     if (!m_imgui_stuff->Init(ImGuiConfigFlags_DockingEnable)) {
         m_msg.e.f("failed to initialise ImGui\n");
         return false;

src/b2/b2.cpp

@@ -1062,7 +1062,9 @@ static bool InitSystem(
 
     if (IsHighDPIEnabled(options, app_handler)) {
 #if SYSTEM_WINDOWS
+#ifdef SDL_HINT_WINDOWS_DPI_AWARENESS
         SDL_SetHint(SDL_HINT_WINDOWS_DPI_AWARENESS, "permonitorv2");
+#endif
 #endif
     }
 

src/b2/dear_imgui.cpp

@@ -100,8 +100,9 @@ ImGuiContextSetter::~ImGuiContextSetter() {
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-ImGuiStuff::ImGuiStuff(SDL_Renderer *renderer, bool enable_test_engine, float default_display_size_x, float default_display_size_y)
-    : m_renderer(renderer)
+ImGuiStuff::ImGuiStuff(SDL_Window *window, SDL_Renderer *renderer, bool enable_test_engine, float default_display_size_x, float default_display_size_y)
+    : m_window(window)
+    , m_renderer(renderer)
     , m_default_display_size_x(default_display_size_x)
     , m_default_display_size_y(default_display_size_y) {
     m_last_new_frame_ticks = GetCurrentTickCount();
@@ -296,21 +297,18 @@ bool ImGuiStuff::Init(ImGuiConfigFlags extra_config_flags) {
 
     // See ImGui_ImplSDL2_Init.
 
-    SDL_Window *window;
     uint32_t window_flags;
-    if (m_renderer) {
-        window = SDL_RenderGetWindow(m_renderer);
-        window_flags = SDL_GetWindowFlags(window);
+    if (m_window) {
+        window_flags = SDL_GetWindowFlags(m_window);
     } else {
-        window = nullptr;
         window_flags = 0;
     }
 
     if (window_flags & SDL_WINDOW_ALLOW_HIGHDPI) {
 #if SYSTEM_WINDOWS
         SDL_SysWMinfo wm_info;
         SDL_VERSION(&wm_info.version);
-        SDL_GetWindowWMInfo(window, &wm_info);
+        SDL_GetWindowWMInfo(m_window, &wm_info);
 
         ImGuiViewport *main_vp = ImGui::GetMainViewport();
         main_vp->PlatformHandleRaw = wm_info.info.win.window;
@@ -328,7 +326,7 @@ bool ImGuiStuff::Init(ImGuiConfigFlags extra_config_flags) {
 #elif SYSTEM_OSX
 
         ImGuiViewport *main_vp = ImGui::GetMainViewport();
-        main_vp->PlatformHandle = window;
+        main_vp->PlatformHandle = m_window;
 
         platform_io.Platform_GetWindowDpiScale = &HandleGetWindowDpiScaleOSX;
 
@@ -338,7 +336,7 @@ bool ImGuiStuff::Init(ImGuiConfigFlags extra_config_flags) {
 
         // The correct initial scale factor does still need to be set.
         ImGuiStyle &style = ImGui::GetStyle();
-        style.FontScaleDpi = GetDpiScale(window);
+        style.FontScaleDpi = GetDpiScale(m_window);
 
 #elif SYSTEM_LINUX
 
@@ -496,10 +494,8 @@ void ImGuiStuff::NewFrame() {
     }
 
     if (m_renderer) {
-        SDL_Window *window = SDL_RenderGetWindow(m_renderer);
-
         int window_width, window_height;
-        SDL_GetWindowSize(window, &window_width, &window_height);
+        SDL_GetWindowSize(m_window, &window_width, &window_height);
 
         int output_width, output_height;
         SDL_GetRendererOutputSize(m_renderer, &output_width, &output_height);

src/b2/dear_imgui.h

@@ -52,6 +52,7 @@
 
 struct SDL_Texture;
 struct SDL_Renderer;
+struct SDL_Window;
 struct SDL_Cursor;
 class Messages;
 class RecentPaths;
@@ -76,7 +77,7 @@ extern const ImGuiStyle IMGUI_DEFAULT_STYLE;
 class ImGuiStuff {
   public:
     // Default display size is used if the renderer is NULL.
-    explicit ImGuiStuff(SDL_Renderer *renderer, bool enable_test_engine, float default_display_size_x, float default_display_size_y);
+    explicit ImGuiStuff(SDL_Window *window, SDL_Renderer *renderer, bool enable_test_engine, float default_display_size_x, float default_display_size_y);
     ~ImGuiStuff();
 
     ImGuiStuff(const ImGuiStuff &) = delete;
@@ -135,6 +136,7 @@ class ImGuiStuff {
         ConsumePressedKeycodeState_Consumed,
     };
 
+    SDL_Window *m_window = nullptr;
     SDL_Renderer *m_renderer = nullptr;
     ImGuiContext *m_context = nullptr;