Canvas: Handle non-zero window position with Viewports (#91, #90)

thedmd · Dec 5, 2020 · a7fdf74 · a7fdf74
1 parent 12e72a9
commit a7fdf74
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -88,3 +88,5 @@ v0.9.1 (WIP):
  BUGFIX: Fix ObjectId serialization
 
  BUGFIX: GroupNode resize instead of move on low zoom #87
+
+ BUGFIX: Make Canvas work with Viewports (#91, #90)
diff --git a/imgui_canvas.cpp b/imgui_canvas.cpp
@@ -350,20 +350,28 @@ void ImGuiEx::Canvas::RestoreInputState()
 void ImGuiEx::Canvas::SaveViewportState()
 {
 # if defined(IMGUI_HAS_VIEWPORT)
+ auto window = ImGui::GetCurrentWindow();
  auto viewport = ImGui::GetWindowViewport();
 
+ m_WindowPosBackup = window->Pos;
  m_ViewportPosBackup = viewport->Pos;
  m_ViewportSizeBackup = viewport->Size;
+ m_ViewportWorkOffsetMinBackup = viewport->WorkOffsetMin;
+ m_ViewportWorkOffsetMaxBackup = viewport->WorkOffsetMax;
 # endif
 }
 
 void ImGuiEx::Canvas::RestoreViewportState()
 {
 # if defined(IMGUI_HAS_VIEWPORT)
+ auto window = ImGui::GetCurrentWindow();
  auto viewport = ImGui::GetWindowViewport();
 
+ window->Pos = m_WindowPosBackup;
  viewport->Pos = m_ViewportPosBackup;
  viewport->Size = m_ViewportSizeBackup;
+ viewport->WorkOffsetMin = m_ViewportWorkOffsetMinBackup;
+ viewport->WorkOffsetMax = m_ViewportWorkOffsetMaxBackup;
 # endif
 }
 
@@ -409,6 +417,9 @@ void ImGuiEx::Canvas::EnterLocalSpace()
  m_DrawListStartVertexIndex = m_DrawList->_VtxCurrentIdx + ImVtxOffsetRef(m_DrawList);
 
 # if defined(IMGUI_HAS_VIEWPORT)
+ auto window = ImGui::GetCurrentWindow();
+ window->Pos = ImVec2(0.0f, 0.0f);
+
  auto viewport_min = m_ViewportPosBackup;
  auto viewport_max = m_ViewportPosBackup + m_ViewportSizeBackup;
 
@@ -420,6 +431,8 @@ void ImGuiEx::Canvas::EnterLocalSpace()
  auto viewport = ImGui::GetWindowViewport();
  viewport->Pos = viewport_min;
  viewport->Size = viewport_max - viewport_min;
+ viewport->WorkOffsetMin = m_ViewportWorkOffsetMinBackup * m_View.InvScale;
+ viewport->WorkOffsetMax = m_ViewportWorkOffsetMaxBackup * m_View.InvScale;
 # endif
 
  // Clip rectangle in parent canvas space and move it to local space.

diff --git a/imgui_canvas.h b/imgui_canvas.h
@@ -250,8 +250,11 @@ struct Canvas
  ImVec2 m_WindowCursorMaxBackup;
 
 # if defined(IMGUI_HAS_VIEWPORT)
+ ImVec2 m_WindowPosBackup;
  ImVec2 m_ViewportPosBackup;
  ImVec2 m_ViewportSizeBackup;
+ ImVec2 m_ViewportWorkOffsetMinBackup;
+ ImVec2 m_ViewportWorkOffsetMaxBackup;
 # endif
 };