fix: auto fit giggle

brenocq · Jan 14, 2025 · 01a71cd · 01a71cd
1 parent 3e5f062
commit 01a71cd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/implot3d.cpp b/implot3d.cpp
@@ -1861,8 +1861,10 @@ void HandleInput(ImPlot3DPlot& plot) {
             // Adjust plot range to translate the plot
             for (int i = 0; i < 3; i++) {
                 if (plot.Axes[i].Hovered) {
-                    plot.Axes[i].SetMin(plot.Axes[i].Range.Min - delta_plot[i]);
-                    plot.Axes[i].SetMax(plot.Axes[i].Range.Max - delta_plot[i]);
+                    if (!plot.Axes[i].IsInputLocked()) {
+                        plot.Axes[i].SetMin(plot.Axes[i].Range.Min - delta_plot[i]);
+                        plot.Axes[i].SetMax(plot.Axes[i].Range.Max - delta_plot[i]);
+                    }
                     plot.Axes[i].Held = true;
                 }
                 // If no axis was held before (user started translating in this frame), set the held edge/plane indices
@@ -1883,8 +1885,10 @@ void HandleInput(ImPlot3DPlot& plot) {
             // Apply translation to the selected axes
             for (int i = 0; i < 3; i++) {
                 if (plot.Axes[i].Hovered) {
-                    plot.Axes[i].SetMin(plot.Axes[i].Range.Min - delta_plot[i]);
-                    plot.Axes[i].SetMax(plot.Axes[i].Range.Max - delta_plot[i]);
+                    if (!plot.Axes[i].IsInputLocked()) {
+                        plot.Axes[i].SetMin(plot.Axes[i].Range.Min - delta_plot[i]);
+                        plot.Axes[i].SetMax(plot.Axes[i].Range.Max - delta_plot[i]);
+                    }
                     plot.Axes[i].Held = true;
                 }
                 if (!any_axis_held) {
@@ -2012,8 +2016,10 @@ void HandleInput(ImPlot3DPlot& plot) {
 
             // Set new range after zoom
             if (plot.Axes[i].Hovered) {
-                plot.Axes[i].SetMin(new_min);
-                plot.Axes[i].SetMax(new_max);
+                if (!plot.Axes[i].IsInputLocked()) {
+                    plot.Axes[i].SetMin(new_min);
+                    plot.Axes[i].SetMax(new_max);
+                }
                 plot.Axes[i].Held = true;
             }
 

diff --git a/implot3d_internal.h b/implot3d_internal.h
@@ -496,6 +496,9 @@ struct ImPlot3DAxis {
     inline bool IsLockedMin() const { return IsRangeLocked() || ImPlot3D::ImHasFlag(Flags, ImPlot3DAxisFlags_LockMin); }
     inline bool IsLockedMax() const { return IsRangeLocked() || ImPlot3D::ImHasFlag(Flags, ImPlot3DAxisFlags_LockMax); }
     inline bool IsLocked() const { return IsLockedMin() && IsLockedMax(); }
+    inline bool IsInputLockedMin() const { return IsLockedMin() || IsAutoFitting(); }
+    inline bool IsInputLockedMax() const { return IsLockedMax() || IsAutoFitting(); }
+    inline bool IsInputLocked() const { return IsLocked() || IsAutoFitting(); }
 
     inline void SetLabel(const char* label) {
         Label.Buf.shrink(0);