Updated display size handling by imgui on Mac and iOS

4 files changed, 6 insertions, 27 deletions

diff --git a/Imgui/interface/ImGuiImplIOS.hpp b/Imgui/interface/ImGuiImplIOS.hpp
index b77ca10..10c792c 100644
--- a/Imgui/interface/ImGuiImplIOS.hpp
+++ b/Imgui/interface/ImGuiImplIOS.hpp
@@ -39,8 +39,6 @@ public:
     ImGuiImplIOS(IRenderDevice* pDevice,
                  TEXTURE_FORMAT BackBufferFmt,
                  TEXTURE_FORMAT DepthBufferFmt,
-                 Uint32         DisplayWidth,
-                 Uint32         DisplayHeight,
                  Uint32         InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize,
                  Uint32         InitialIndexBufferSize  = ImGuiImplDiligent::DefaultInitialIBSize);
     ~ImGuiImplIOS();
@@ -56,7 +54,6 @@ public:
                           Uint32            RenderSurfaceHeight,
                           SURFACE_TRANSFORM SurfacePreTransform) override final;
     virtual void Render(IDeviceContext* pCtx) override final;
-    void         SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight);
     bool         OnTouchEvent(float x, float y, bool IsActive);
 
 private:
diff --git a/Imgui/interface/ImGuiImplMacOS.hpp b/Imgui/interface/ImGuiImplMacOS.hpp
index 8942b0f..f000432 100644
--- a/Imgui/interface/ImGuiImplMacOS.hpp
+++ b/Imgui/interface/ImGuiImplMacOS.hpp
@@ -42,8 +42,6 @@ public:
     ImGuiImplMacOS(IRenderDevice* _Nonnull pDevice,
                    TEXTURE_FORMAT BackBufferFmt,
                    TEXTURE_FORMAT DepthBufferFmt,
-                   Uint32         DisplayWidth,
-                   Uint32         DisplayHeight,
                    Uint32         InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize,
                    Uint32         InitialIndexBufferSize  = ImGuiImplDiligent::DefaultInitialIBSize);
     ~ImGuiImplMacOS();
@@ -60,7 +58,6 @@ public:
                           SURFACE_TRANSFORM SurfacePreTransform) override final;
     virtual void Render(IDeviceContext* _Nonnull pCtx) override final;
     bool         HandleOSXEvent(NSEvent* _Nonnull event, NSView* _Nonnull view);
-    void         SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight);
 
 private:
     std::mutex m_Mtx;
diff --git a/Imgui/src/ImGuiImplIOS.mm b/Imgui/src/ImGuiImplIOS.mm
index 82ceb72..fe730d9 100644
--- a/Imgui/src/ImGuiImplIOS.mm
+++ b/Imgui/src/ImGuiImplIOS.mm
@@ -31,16 +31,13 @@ namespace Diligent
 ImGuiImplIOS::ImGuiImplIOS(IRenderDevice*  pDevice,
                            TEXTURE_FORMAT  BackBufferFmt,
                            TEXTURE_FORMAT  DepthBufferFmt,
-                           Uint32          DisplayWidth,
-                           Uint32          DisplayHeight,
                            Uint32          InitialVertexBufferSize,
                            Uint32          InitialIndexBufferSize) :
     ImGuiImplDiligent(pDevice, BackBufferFmt, DepthBufferFmt, InitialVertexBufferSize, InitialIndexBufferSize)
 {
     ImGuiIO& io = ImGui::GetIO();
     //io.FontGlobalScale = 2;
-    io.DisplaySize = ImVec2(DisplayWidth, DisplayHeight);
-    io.BackendPlatformName = "ImGuiImplIOS";
+    io.BackendPlatformName = "Diligent-ImGuiImplIOS";
 }
 
 ImGuiImplIOS::~ImGuiImplIOS()
@@ -57,14 +54,9 @@ void ImGuiImplIOS::NewFrame(Uint32 RenderSurfaceWidth, Uint32 RenderSurfaceHeigh
     io.DeltaTime = current_time - m_Time;
     m_Time = current_time;
 
-    ImGuiImplDiligent::NewFrame(RenderSurfaceWidth, RenderSurfaceHeight, SurfacePreTransform);
-}
+    io.DisplaySize = ImVec2(RenderSurfaceWidth, RenderSurfaceHeight);
 
-void ImGuiImplIOS::SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight)
-{
-    std::lock_guard<std::mutex> Lock(m_Mtx);
-    ImGuiIO& io = ImGui::GetIO();
-    io.DisplaySize = ImVec2(DisplayWidth, DisplayHeight);
+    ImGuiImplDiligent::NewFrame(RenderSurfaceWidth, RenderSurfaceHeight, SurfacePreTransform);
 }
 
 bool ImGuiImplIOS::OnTouchEvent(float x, float y, bool IsActive)
diff --git a/Imgui/src/ImGuiImplMacOS.mm b/Imgui/src/ImGuiImplMacOS.mm
index afe908f..b3c9230 100644
--- a/Imgui/src/ImGuiImplMacOS.mm
+++ b/Imgui/src/ImGuiImplMacOS.mm
@@ -32,8 +32,6 @@ namespace Diligent
 ImGuiImplMacOS::ImGuiImplMacOS(IRenderDevice*  pDevice,
                                TEXTURE_FORMAT  BackBufferFmt,
                                TEXTURE_FORMAT  DepthBufferFmt,
-                               Uint32          DisplayWidth,
-                               Uint32          DisplayHeight,
                                Uint32          InitialVertexBufferSize,
                                Uint32          InitialIndexBufferSize) :
     ImGuiImplDiligent(pDevice, BackBufferFmt, DepthBufferFmt, InitialVertexBufferSize, InitialIndexBufferSize)
@@ -41,7 +39,7 @@ ImGuiImplMacOS::ImGuiImplMacOS(IRenderDevice*  pDevice,
     ImGui_ImplOSX_Init();
     ImGuiIO& io = ImGui::GetIO();
     io.FontGlobalScale = 2;
-    io.DisplaySize = ImVec2(DisplayWidth, DisplayHeight);
+    io.BackendPlatformName = "Diligent-ImGuiImplMacOS";
 }
 
 ImGuiImplMacOS::~ImGuiImplMacOS()
@@ -54,17 +52,12 @@ void ImGuiImplMacOS::NewFrame(Uint32            RenderSurfaceWidth,
                               SURFACE_TRANSFORM SurfacePreTransform)
 {
     std::lock_guard<std::mutex> Lock(m_Mtx);
+    ImGuiIO& io = ImGui::GetIO();
+    io.DisplaySize = ImVec2(RenderSurfaceWidth, RenderSurfaceHeight);
     ImGui_ImplOSX_NewFrame(nil);
     ImGuiImplDiligent::NewFrame(RenderSurfaceWidth, RenderSurfaceHeight, SurfacePreTransform);
 }
 
-void ImGuiImplMacOS::SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight)
-{
-    std::lock_guard<std::mutex> Lock(m_Mtx);
-    ImGuiIO& io = ImGui::GetIO();
-    io.DisplaySize = ImVec2(DisplayWidth, DisplayHeight);
-}
-
 bool ImGuiImplMacOS::HandleOSXEvent(NSEvent *_Nonnull event, NSView *_Nonnull view)
 {
     std::lock_guard<std::mutex> Lock(m_Mtx);