Scale everthing with the dpiScale factor

BruegelN · BruegelN · commit 40f4f2712808 · 2025-02-01T16:01:44.000+01:00
diff --git a/examples/demo-app/demo_app.cpp b/examples/demo-app/demo_app.cpp
@@ -780,7 +780,7 @@ void callback() {
   static int loadedMat = 1;
   static bool depthClick = false;
 
-  ImGui::PushItemWidth(100);
+  ImGui::PushItemWidth(100 * polyscope::state::globalContext.dpiScale);
 
   ImGui::InputInt("num points", &numPoints);
   ImGui::InputFloat("param value", &param);
diff --git a/include/polyscope/parameterization_quantity.ipp b/include/polyscope/parameterization_quantity.ipp
@@ -61,7 +61,7 @@ ParameterizationQuantity<QuantityT>::ParameterizationQuantity(QuantityT& quantit
 template <typename QuantityT>
 void ParameterizationQuantity<QuantityT>::buildParameterizationUI() {
 
-  ImGui::PushItemWidth(100);
+  ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
 
   // Modulo stripey width
   if (ImGui::DragFloat("period", &checkerSize.get(), .001, 0.0001, 1.0, "%.4f",
@@ -82,7 +82,7 @@ void ParameterizationQuantity<QuantityT>::buildParameterizationUI() {
       setCheckerColors(getCheckerColors());
     break;
   case ParamVizStyle::CHECKER_ISLANDS:
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     if (ImGui::DragFloat("alt darkness", &altDarkness.get(), 0.01, 0., 1.)) {
       altDarkness.manuallyChanged();
       requestRedraw();
@@ -103,7 +103,7 @@ void ParameterizationQuantity<QuantityT>::buildParameterizationUI() {
   case ParamVizStyle::LOCAL_CHECK:
   case ParamVizStyle::LOCAL_RAD: {
     // Angle slider
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     ImGui::SliderAngle("angle shift", &localRot, -180,
                        180); // displays in degrees, works in radians TODO refresh/update/persist
     if (ImGui::DragFloat("alt darkness", &altDarkness.get(), 0.01, 0., 1.)) {
diff --git a/include/polyscope/scalar_quantity.ipp b/include/polyscope/scalar_quantity.ipp
@@ -147,7 +147,7 @@ void ScalarQuantity<QuantityT>::buildScalarUI() {
   // Isolines
   if (isolinesEnabled.get()) {
 
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
 
 
     auto styleName = [](const IsolineStyle& m) -> std::string {
diff --git a/src/camera_view.cpp b/src/camera_view.cpp
@@ -366,7 +366,7 @@ void CameraView::buildCustomUI() {
 
 void CameraView::buildCustomOptionsUI() {
 
-  ImGui::PushItemWidth(150);
+  ImGui::PushItemWidth(150 * state::globalContext.dpiScale);
 
   if (widgetFocalLengthUpper == -777) widgetFocalLengthUpper = 2. * (*widgetFocalLength.get().getValuePtr());
   if (ImGui::SliderFloat("widget focal length", widgetFocalLength.get().getValuePtr(), 0, widgetFocalLengthUpper,
diff --git a/src/curve_network.cpp b/src/curve_network.cpp
@@ -402,7 +402,7 @@ void CurveNetwork::buildCustomUI() {
     setColor(getColor());
   }
   ImGui::SameLine();
-  ImGui::PushItemWidth(100);
+  ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
   if (ImGui::SliderFloat("Radius", radius.get().getValuePtr(), 0.0, .1, "%.5f",
                          ImGuiSliderFlags_Logarithmic | ImGuiSliderFlags_NoRoundToFormat)) {
     radius.manuallyChanged();
diff --git a/src/file_helpers.cpp b/src/file_helpers.cpp
@@ -14,7 +14,7 @@ void filenamePromptCallback(char* buff, size_t len) {
   static bool windowOpen = true;
   ImGui::Begin("Enter filename", &windowOpen, ImGuiWindowFlags_AlwaysAutoResize);
 
-  ImGui::PushItemWidth(500);
+  ImGui::PushItemWidth(500 * state::globalContext.dpiScale);
   ImGui::InputText("##filename", buff, len);
 
   if (ImGui::Button("Ok")) {
diff --git a/src/image_quantity_base.cpp b/src/image_quantity_base.cpp
@@ -114,7 +114,7 @@ void ImageQuantity::buildImageUI() {
 
   if (getShowFullscreen()) {
 
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     if (ImGui::SliderFloat("transparency", &transparency.get(), 0.f, 1.f)) {
       transparency.manuallyChanged();
       requestRedraw();
diff --git a/src/messages.cpp b/src/messages.cpp
@@ -174,7 +174,7 @@ void buildWarningUI(std::string warningBaseString, std::string warningDetailStri
     }
 
     // Nice button sizing
-    float buttonWidth = 120;
+    float buttonWidth = 120 * state::globalContext.dpiScale;
     float buttonOffset = (warningModalSize.x - buttonWidth) / 2.0;
     buttonOffset = std::max(buttonOffset, 0.0f);
     doIndent = buttonOffset > 0;
diff --git a/src/point_cloud.cpp b/src/point_cloud.cpp
@@ -266,7 +266,7 @@ void PointCloud::buildCustomUI() {
     setPointColor(getPointColor());
   }
   ImGui::SameLine();
-  ImGui::PushItemWidth(70);
+  ImGui::PushItemWidth(70 * state::globalContext.dpiScale);
   if (ImGui::SliderFloat("Radius", pointRadius.get().getValuePtr(), 0.0, .1, "%.5f",
                          ImGuiSliderFlags_Logarithmic | ImGuiSliderFlags_NoRoundToFormat)) {
     pointRadius.manuallyChanged();
diff --git a/src/polyscope.cpp b/src/polyscope.cpp
@@ -47,8 +47,10 @@ bool unshowRequested = false;
 float imguiStackMargin = 10;
 float lastWindowHeightPolyscope = 200;
 float lastWindowHeightUser = 200;
-float leftWindowsWidth = 305;
-float rightWindowsWidth = 500;
+constexpr float LEFT_WINDOWS_WIDTH = 305;
+constexpr float RIGHT_WINDOWS_WIDTH = 500;
+float leftWindowsWidth = LEFT_WINDOWS_WIDTH;
+float rightWindowsWidth = RIGHT_WINDOWS_WIDTH;
 
 auto lastMainLoopIterTime = std::chrono::steady_clock::now();
 
@@ -554,7 +556,7 @@ void userGuiBegin() {
 void userGuiEnd() {
 
   if (options::userGuiIsOnRightSide) {
-    rightWindowsWidth = ImGui::GetWindowWidth();
+    rightWindowsWidth = RIGHT_WINDOWS_WIDTH * state::globalContext.dpiScale;
     lastWindowHeightUser = imguiStackMargin + ImGui::GetWindowHeight();
   } else {
     lastWindowHeightUser = 0;
@@ -645,7 +647,7 @@ void buildPolyscopeGui() {
     ImGui::Text("Rolling: %.1f ms/frame (%.1f fps)", 1000.0f / ImGui::GetIO().Framerate, ImGui::GetIO().Framerate);
     ImGui::Text("Last: %.1f ms/frame (%.1f fps)", ImGui::GetIO().DeltaTime * 1000.f, 1.f / ImGui::GetIO().DeltaTime);
 
-    ImGui::PushItemWidth(40);
+    ImGui::PushItemWidth(40 * state::globalContext.dpiScale);
     if (ImGui::InputInt("max fps", &options::maxFPS, 0)) {
       if (options::maxFPS < 1 && options::maxFPS != -1) {
         options::maxFPS = -1;
@@ -679,7 +681,7 @@ void buildPolyscopeGui() {
 
 
   lastWindowHeightPolyscope = imguiStackMargin + ImGui::GetWindowHeight();
-  leftWindowsWidth = ImGui::GetWindowWidth();
+  leftWindowsWidth = LEFT_WINDOWS_WIDTH * state::globalContext.dpiScale;
 
   ImGui::End();
 }
@@ -748,7 +750,7 @@ void buildStructureGui() {
     ImGui::PopID();
   }
 
-  leftWindowsWidth = ImGui::GetWindowWidth();
+  leftWindowsWidth = LEFT_WINDOWS_WIDTH * state::globalContext.dpiScale;
 
   ImGui::End();
 }
@@ -767,7 +769,7 @@ void buildPickGui() {
     ImGui::Separator();
     selection.first->buildPickUI(selection.second);
 
-    rightWindowsWidth = ImGui::GetWindowWidth();
+    rightWindowsWidth = RIGHT_WINDOWS_WIDTH * state::globalContext.dpiScale;
     ImGui::End();
   }
 }
diff --git a/src/render/color_maps.cpp b/src/render/color_maps.cpp
@@ -6,6 +6,7 @@
 #include "polyscope/render/engine.h"
 
 #include "imgui.h"
+#include "polyscope/polyscope.h"
 
 namespace polyscope {
 
@@ -17,7 +18,7 @@ namespace render {
 bool buildColormapSelector(std::string& cm, std::string fieldName) {
   bool changed = false;
 
-  ImGui::PushItemWidth(125);
+  ImGui::PushItemWidth(125 * state::globalContext.dpiScale);
 
   if (ImGui::BeginCombo(fieldName.c_str(), cm.c_str())) {
     for (auto& c : render::engine->colorMaps) {
diff --git a/src/render/engine.cpp b/src/render/engine.cpp
@@ -280,7 +280,7 @@ void Engine::buildEngineGui() {
   if (ImGui::TreeNode("Appearance")) {
 
     // == Display
-    ImGui::PushItemWidth(120);
+    ImGui::PushItemWidth(120 * state::globalContext.dpiScale);
     // ImGui::Text("Background");
     // ImGui::SameLine();
     static std::string displayBackgroundName = "None";
diff --git a/src/render/ground_plane.cpp b/src/render/ground_plane.cpp
@@ -411,7 +411,7 @@ void GroundPlane::buildGui() {
   ImGui::SetNextItemOpen(false, ImGuiCond_FirstUseEver);
   if (ImGui::TreeNode("Ground Plane")) {
 
-    ImGui::PushItemWidth(160);
+    ImGui::PushItemWidth(160*state::globalContext.dpiScale);
     if (ImGui::BeginCombo("Mode", modeName(options::groundPlaneMode).c_str())) {
       for (GroundPlaneMode m : {GroundPlaneMode::None, GroundPlaneMode::Tile, GroundPlaneMode::TileReflection,
                                 GroundPlaneMode::ShadowOnly}) {
@@ -426,7 +426,7 @@ void GroundPlane::buildGui() {
     ImGui::PopItemWidth();
 
     // Height
-    ImGui::PushItemWidth(80);
+    ImGui::PushItemWidth(80 * state::globalContext.dpiScale);
     switch (options::groundPlaneHeightMode) {
     case GroundPlaneHeightMode::Automatic:
       if (ImGui::SliderFloat("##HeightValue", options::groundPlaneHeightFactor.getValuePtr(), -1.0, 1.0))
@@ -446,7 +446,7 @@ void GroundPlane::buildGui() {
     }
     ImGui::PopItemWidth();
     ImGui::SameLine();
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100*state::globalContext.dpiScale);
     if (ImGui::BeginCombo("Height##Mode", heightModeName(options::groundPlaneHeightMode).c_str())) {
       for (GroundPlaneHeightMode m : {GroundPlaneHeightMode::Automatic, GroundPlaneHeightMode::Manual}) {
         std::string mName = heightModeName(m);
diff --git a/src/surface_mesh.cpp b/src/surface_mesh.cpp
@@ -1249,7 +1249,7 @@ void SurfaceMesh::buildCustomUI() {
 
   { // Flat shading or smooth shading?
     ImGui::SameLine();
-    ImGui::PushItemWidth(85);
+    ImGui::PushItemWidth(85 * state::globalContext.dpiScale);
 
     auto styleName = [](const MeshShadeStyle& m) -> std::string {
       switch (m) {
@@ -1278,7 +1278,7 @@ void SurfaceMesh::buildCustomUI() {
 
   { // Edge options
     ImGui::SameLine();
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     if (edgeWidth.get() == 0.) {
       bool showEdges = false;
       if (ImGui::Checkbox("Edges", &showEdges)) {
@@ -1291,14 +1291,14 @@ void SurfaceMesh::buildCustomUI() {
       }
 
       // Edge color
-      ImGui::PushItemWidth(100);
+      ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
       if (ImGui::ColorEdit3("Edge Color", &edgeColor.get()[0], ImGuiColorEditFlags_NoInputs))
         setEdgeColor(edgeColor.get());
       ImGui::PopItemWidth();
 
       // Edge width
       ImGui::SameLine();
-      ImGui::PushItemWidth(75);
+      ImGui::PushItemWidth(75 * state::globalContext.dpiScale);
       if (ImGui::SliderFloat("Width", &edgeWidth.get(), 0.001, 2.)) {
         // NOTE: this intentionally circumvents the setEdgeWidth() setter to avoid repopulating the buffer as the
         // slider is dragged---otherwise we repopulate the buffer on every change, which mostly works fine. This is a
@@ -1419,12 +1419,12 @@ long long int SurfaceMesh::selectVertex() {
       ImGui::SetNextWindowSize(ImVec2(300, 0), ImGuiCond_Once);
       ImGui::Begin("Select vertex", &showWindow);
 
-      ImGui::PushItemWidth(300);
+      ImGui::PushItemWidth(300 * state::globalContext.dpiScale);
       ImGui::TextUnformatted("Hold ctrl and left-click to select a vertex");
       ImGui::Separator();
 
       // Choose by number
-      ImGui::PushItemWidth(300);
+      ImGui::PushItemWidth(300 * state::globalContext.dpiScale);
       static int iV = -1;
       ImGui::InputInt("index", &iV);
       if (ImGui::Button("Select by index")) {
diff --git a/src/view.cpp b/src/view.cpp
@@ -728,7 +728,7 @@ void buildViewGui() {
 
     std::string viewStyleName = to_string(view::style);
 
-    ImGui::PushItemWidth(120);
+    ImGui::PushItemWidth(120 * state::globalContext.dpiScale);
     std::array<NavigateStyle, 5> styles{NavigateStyle::Turntable, NavigateStyle::Free, NavigateStyle::Planar,
                                         NavigateStyle::None, NavigateStyle::FirstPerson};
     if (ImGui::BeginCombo("##View Style", viewStyleName.c_str())) {
@@ -747,7 +747,7 @@ void buildViewGui() {
     ImGui::Text("Camera Style");
 
     { // == Up direction
-      ImGui::PushItemWidth(120);
+      ImGui::PushItemWidth(120 * state::globalContext.dpiScale);
       std::string upStyleName;
       switch (upDir) {
       case UpDir::XUp:
@@ -802,7 +802,7 @@ void buildViewGui() {
     }
 
     { // == Front direction
-      ImGui::PushItemWidth(120);
+      ImGui::PushItemWidth(120 * state::globalContext.dpiScale);
       std::string frontStyleName;
       switch (frontDir) {
       case FrontDir::XFront:
@@ -894,7 +894,7 @@ void buildViewGui() {
 
 
         ImGui::TextUnformatted("Bounding Box:");
-        ImGui::PushItemWidth(200);
+        ImGui::PushItemWidth(200 * state::globalContext.dpiScale);
         glm::vec3& bboxMin = std::get<0>(state::boundingBox);
         glm::vec3& bboxMax = std::get<1>(state::boundingBox);
         if (ImGui::InputFloat3("min", &bboxMin[0])) updateStructureExtents();
@@ -958,7 +958,7 @@ void buildViewGui() {
       {
         ImGui::TextUnformatted("Dim:");
         ImGui::SameLine();
-        ImGui::PushItemWidth(50);
+        ImGui::PushItemWidth(50 * state::globalContext.dpiScale);
         bool changed = false;
         int currWidth = view::windowWidth;
         int currHeight = view::windowHeight;
diff --git a/src/volume_grid.cpp b/src/volume_grid.cpp
@@ -52,7 +52,7 @@ void VolumeGrid::buildCustomUI() {
 
   { // Edge options
     ImGui::SameLine();
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     if (edgeWidth.get() == 0.) {
       bool showEdges = false;
       if (ImGui::Checkbox("Edges", &showEdges)) {
@@ -65,14 +65,14 @@ void VolumeGrid::buildCustomUI() {
       }
 
       // Edge color
-      ImGui::PushItemWidth(100);
+      ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
       if (ImGui::ColorEdit3("Edge Color", &edgeColor.get()[0], ImGuiColorEditFlags_NoInputs))
         setEdgeColor(edgeColor.get());
       ImGui::PopItemWidth();
 
       // Edge width
       ImGui::SameLine();
-      ImGui::PushItemWidth(75);
+      ImGui::PushItemWidth(75 * state::globalContext.dpiScale);
       if (ImGui::SliderFloat("Width", &edgeWidth.get(), 0.001, 2.)) {
         // NOTE: this intentionally circumvents the setEdgeWidth() setter to avoid repopulating the buffer as the
         // slider is dragged---otherwise we repopulate the buffer on every change, which mostly works fine. This is a
diff --git a/src/volume_grid_scalar_quantity.cpp b/src/volume_grid_scalar_quantity.cpp
@@ -70,7 +70,7 @@ void VolumeGridNodeScalarQuantity::buildCustomUI() {
     ImGui::SameLine();
 
     // Set isovalue
-    ImGui::PushItemWidth(120);
+    ImGui::PushItemWidth(120 * state::globalContext.dpiScale);
     if (ImGui::SliderFloat("##Radius", &isosurfaceLevel.get(), vizRangeMin.get(), vizRangeMax.get(), "%.4e")) {
       // Note: we intentionally do this rather than calling setIsosurfaceLevel(), because that function immediately
       // recomputes the levelset mesh, which is too expensive during user interaction
diff --git a/src/volume_mesh.cpp b/src/volume_mesh.cpp
@@ -871,7 +871,7 @@ void VolumeMesh::buildCustomUI() {
 
   ImGui::SameLine();
   { // Edge options
-    ImGui::PushItemWidth(100);
+    ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
     if (edgeWidth.get() == 0.) {
       bool showEdges = false;
       if (ImGui::Checkbox("Edges", &showEdges)) {
@@ -884,14 +884,14 @@ void VolumeMesh::buildCustomUI() {
       }
 
       // Edge color
-      ImGui::PushItemWidth(100);
+      ImGui::PushItemWidth(100 * state::globalContext.dpiScale);
       if (ImGui::ColorEdit3("Edge Color", &edgeColor.get()[0], ImGuiColorEditFlags_NoInputs))
         setEdgeColor(edgeColor.get());
       ImGui::PopItemWidth();
 
       // Edge width
       ImGui::SameLine();
-      ImGui::PushItemWidth(60);
+      ImGui::PushItemWidth(60 * state::globalContext.dpiScale);
       if (ImGui::SliderFloat("Width", &edgeWidth.get(), 0.001, 2.)) {
         // NOTE: this intentionally circumvents the setEdgeWidth() setter to avoid repopulating the buffer as the
         // slider is dragged---otherwise we repopulate the buffer on every change, which mostly works fine. This is a

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ void CurveNetwork::buildCustomUI() {`
`402`	`402`	`setColor(getColor());`
`403`	`403`	`}`
`404`	`404`	`ImGui::SameLine();`
`405`		`- ImGui::PushItemWidth(100);`
	`405`	`+ ImGui::PushItemWidth(100 * state::globalContext.dpiScale);`
`406`	`406`	`if (ImGui::SliderFloat("Radius", radius.get().getValuePtr(), 0.0, .1, "%.5f",`
`407`	`407`	`ImGuiSliderFlags_Logarithmic \| ImGuiSliderFlags_NoRoundToFormat)) {`
`408`	`408`	`radius.manuallyChanged();`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ void buildWarningUI(std::string warningBaseString, std::string warningDetailStri`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`// Nice button sizing`
`177`		`- float buttonWidth = 120;`
	`177`	`+ float buttonWidth = 120 * state::globalContext.dpiScale;`
`178`	`178`	`float buttonOffset = (warningModalSize.x - buttonWidth) / 2.0;`
`179`	`179`	`buttonOffset = std::max(buttonOffset, 0.0f);`
`180`	`180`	`doIndent = buttonOffset > 0;`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void PointCloud::buildCustomUI() {`
`266`	`266`	`setPointColor(getPointColor());`
`267`	`267`	`}`
`268`	`268`	`ImGui::SameLine();`
`269`		`- ImGui::PushItemWidth(70);`
	`269`	`+ ImGui::PushItemWidth(70 * state::globalContext.dpiScale);`
`270`	`270`	`if (ImGui::SliderFloat("Radius", pointRadius.get().getValuePtr(), 0.0, .1, "%.5f",`
`271`	`271`	`ImGuiSliderFlags_Logarithmic \| ImGuiSliderFlags_NoRoundToFormat)) {`
`272`	`272`	`pointRadius.manuallyChanged();`