diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-04-28 01:35:39 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-04-28 01:35:39 +0000 |
| commit | 39e733a67f7c7e532c45cd02a153e4dd0324a3b8 (patch) | |
| tree | 627a641f97a6cdbde9934ec6472dc1112caeac12 /Imgui/src | |
| parent | Updated Android native app to better handle orientation changes (diff) | |
| download | DiligentTools-39e733a67f7c7e532c45cd02a153e4dd0324a3b8.tar.gz DiligentTools-39e733a67f7c7e532c45cd02a153e4dd0324a3b8.zip | |
Updated display size handling by imgui on Mac and iOS
Diffstat (limited to 'Imgui/src')
| -rw-r--r-- | Imgui/src/ImGuiImplIOS.mm | 14 | ||||
| -rw-r--r-- | Imgui/src/ImGuiImplMacOS.mm | 13 |
2 files changed, 6 insertions, 21 deletions
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); |