Center CheatSheet vertically (#1985)

* Center cheatsheet vertically * Update tests * Add a new test
f3d-app · Feb 25, 2025 · 695141f · 695141f
1 parent c1c0058
commit 695141f
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 16 deletions.
diff --git a/application/testing/CMakeLists.txt b/application/testing/CMakeLists.txt
@@ -442,6 +442,10 @@ f3d_test(NAME TestInteractionCheatsheetOpacity DATA cow.vtp INTERACTION UI ARGS
 f3d_test(NAME TestInteractionCheatsheetAnimationName DATA InterpolationTest.glb ARGS --animation-index=6 INTERACTION UI) #HWWW
 f3d_test(NAME TestInteractionCheatsheetConfigFile DATA dragon.vtu CONFIG ${F3D_SOURCE_DIR}/testing/configs/bindings.json INTERACTION UI) #H;ScrollDown
 
+if(NOT F3D_MODULE_RAYTRACING)
+  f3d_test(NAME TestInteractionCheatsheetCentered DATA cow.vtp ARGS --resolution=500,1500 INTERACTION UI LONG_TIMEOUT) #H
+endif()
+
 f3d_test(NAME TestCameraPersp DATA Cameras.gltf ARGS --camera-index=0)
 f3d_test(NAME TestCameraOrtho DATA Cameras.gltf ARGS --camera-index=1)
 f3d_test(NAME TestCameraIndexConfiguration DATA Cameras.gltf ARGS --camera-index=0  --camera-azimuth-angle=15 --camera-position=0.7,0.5,3)

diff --git a/testing/baselines/TestInteractionCheatsheetAnimationName.png b/testing/baselines/TestInteractionCheatsheetAnimationName.png
diff --git a/testing/baselines/TestInteractionCheatsheetBlackBG.png b/testing/baselines/TestInteractionCheatsheetBlackBG.png
diff --git a/testing/baselines/TestInteractionCheatsheetCentered.png b/testing/baselines/TestInteractionCheatsheetCentered.png
diff --git a/testing/baselines/TestInteractionCheatsheetConfigFile.png b/testing/baselines/TestInteractionCheatsheetConfigFile.png
diff --git a/testing/baselines/TestInteractionCheatsheetNoFile.png b/testing/baselines/TestInteractionCheatsheetNoFile.png
diff --git a/testing/baselines/TestInteractionCheatsheetOpacity.png b/testing/baselines/TestInteractionCheatsheetOpacity.png
diff --git a/testing/baselines/TestInteractionCheatsheetScalars.png b/testing/baselines/TestInteractionCheatsheetScalars.png
diff --git a/testing/baselines/TestInteractionCheatsheetWhiteBG.png b/testing/baselines/TestInteractionCheatsheetWhiteBG.png
diff --git a/testing/recordings/TestInteractionCheatsheetCentered.log b/testing/recordings/TestInteractionCheatsheetCentered.log
@@ -0,0 +1,6 @@
+# StreamVersion 1.1
+ExposeEvent 0 599 0 0 0 0
+RenderEvent 0 599 0 0 0 0
+KeyPressEvent 738 539 0 104 1 h
+CharEvent 738 539 0 104 1 h
+KeyReleaseEvent 738 539 0 104 1 h
diff --git a/vtkext/private/module/vtkF3DImguiActor.cxx b/vtkext/private/module/vtkF3DImguiActor.cxx
@@ -344,9 +344,13 @@ void vtkF3DImguiActor::RenderCheatSheet()
   constexpr float marginLeft = 5.f;
   constexpr float marginTopBottom = 5.f;
 
+  float textHeight = 0.f;
   float winWidth = 0.f;
+
   for (const auto& [group, content] : this->CheatSheet)
   {
+    textHeight +=
+      ImGui::GetTextLineHeightWithSpacing() + 2 * ImGui::GetStyle().SeparatorTextPadding.y;
     for (const auto& [bind, desc, val] : content)
     {
       std::string line = bind;
@@ -359,12 +363,17 @@ void vtkF3DImguiActor::RenderCheatSheet()
       ImVec2 currentLine = ImGui::CalcTextSize(line.c_str());
 
       winWidth = std::max(winWidth, currentLine.x);
+      textHeight += ImGui::GetTextLineHeightWithSpacing();
     }
   }
+
   winWidth += 2.f * ImGui::GetStyle().WindowPadding.x + ImGui::GetStyle().ScrollbarSize;
+  textHeight += 2.f * ImGui::GetStyle().WindowPadding.y;
+
+  const float winTop = std::max(marginTopBottom, (viewport->WorkSize.y - textHeight) * 0.5f);
 
-  ::SetupNextWindow(ImVec2(marginLeft, marginTopBottom),
-    ImVec2(winWidth, viewport->WorkSize.y - 2.f * marginTopBottom));
+  ::SetupNextWindow(ImVec2(marginLeft, winTop),
+    ImVec2(winWidth, std::min(viewport->WorkSize.y - (2 * marginTopBottom), textHeight)));
   ImGui::SetNextWindowBgAlpha(0.35f);
 
   ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |