Made axis row height logic consistent across modes, and made max row height a format setting

Author: funkenjaeger

rcp/components/home/dro_mode_layout.py

@@ -1,13 +1,34 @@
 from rcp.components.home.dro_coordbar import DroCoordBar
 from rcp.components.home.mode_layout import ModeLayout
+from kivy.uix.widget import Widget
 
 
 class DroModeLayout(ModeLayout):
-    """DRO mode: simplified DroCoordBars filling all space, no bottom bar."""
+    """DRO mode: simplified DroCoordBars, no bottom bar."""
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
+
         self.build_axis_bars()
+        self.spacer = Widget()
+        self.add_widget(self.spacer)
+
+        self.app.formats.bind(max_row_height=lambda *_: self._update_row_heights())
+        self.bind(height=self._update_row_heights)
+        self._update_row_heights()
+
+    def _update_row_heights(self, *args):
+        num_rows = len(self.axis_bars)
+        if num_rows == 0:
+            return
+
+        row_height = min(self.height / num_rows, self.app.formats.max_row_height)
+
+        for bar in self.axis_bars:
+            bar.size_hint_y = None
+            bar.height = row_height
+
+        # spacer absorbs remaining space (size_hint_y defaults to 1)
 
     def build_axis_bars(self):
         for axis_disp in self.app.axes:

rcp/components/home/els_mode_layout.py

@@ -15,10 +15,8 @@
 ICON_CCW = "\uf0e2"  # rotate-left
 ICON_STOP = "\uf04d"  # stop
 
-MAX_ROW_HEIGHT = 150
 LONG_PRESS_THRESHOLD = 1.0
 
-
 class ElsSpindleInfo(BoxLayout):
     """Displays spindle speed with direction icon and absolute position with zero button."""
     spindle_rpm = StringProperty("--")
@@ -99,6 +97,7 @@ def __init__(self, els_bar: ElsBar, **kwargs):
             x_axis_index=lambda *a: self.rebuild_axes(),
         )
 
+        self.app.formats.bind(max_row_height=lambda *_: self._update_row_heights())
         self.bind(height=self._update_row_heights)
         self._update_row_heights()
 
@@ -108,7 +107,7 @@ def _update_row_heights(self, *args):
             return
 
         available = self.height - self.els_bar.height
-        row_height = min(available / num_rows, MAX_ROW_HEIGHT)
+        row_height = min(available / num_rows, self.app.formats.max_row_height)
 
         self.spindle_info.size_hint_y = None
         self.spindle_info.height = row_height

rcp/components/home/index_mode_layout.py

@@ -1,6 +1,7 @@
 from rcp.components.home.coordbar import CoordBar
 from rcp.components.home.mode_layout import ModeLayout
 from rcp.components.home.servobar import ServoBar
+from kivy.uix.widget import Widget
 
 
 class IndexModeLayout(ModeLayout):
@@ -9,9 +10,16 @@ class IndexModeLayout(ModeLayout):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.servo_bar = ServoBar()
+        self.spacer = Widget()
+
         self.build_axis_bars()
+        self.add_widget(self.spacer)
         self.add_widget(self.servo_bar)
 
+        self.app.formats.bind(max_row_height=lambda *_: self._update_row_heights())
+        self.bind(height=self._update_row_heights)
+        self._update_row_heights()
+
     def build_axis_bars(self):
         for axis_disp in self.app.axes:
             cb = CoordBar(axis=axis_disp)
@@ -22,3 +30,17 @@ def rebuild_axes(self):
         self.remove_widget(self.servo_bar)
         super().rebuild_axes()
         self.add_widget(self.servo_bar)
+
+    def _update_row_heights(self, *args):
+        num_rows = len(self.axis_bars)
+        if num_rows == 0:
+            return
+
+        available = self.height - self.servo_bar.height
+        row_height = min(available / num_rows, self.app.formats.max_row_height)
+
+        for bar in self.axis_bars:
+            bar.size_hint_y = None
+            bar.height = row_height
+
+        # spacer absorbs remaining space (size_hint_y defaults to 1)

rcp/components/home/jog_mode_layout.py

@@ -1,6 +1,7 @@
 from rcp.components.home.coordbar import CoordBar
 from rcp.components.home.jogbar import JogBar
 from rcp.components.home.mode_layout import ModeLayout
+from kivy.uix.widget import Widget
 
 
 class JogModeLayout(ModeLayout):
@@ -10,8 +11,14 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.jog_bar = JogBar()
         self.build_axis_bars()
+        self.spacer = Widget()
+        self.add_widget(self.spacer)
         self.add_widget(self.jog_bar)
 
+        self.app.formats.bind(max_row_height=lambda *_: self._update_row_heights())
+        self.bind(height=self._update_row_heights)
+        self._update_row_heights()
+
     def build_axis_bars(self):
         for axis_disp in self.app.axes:
             cb = CoordBar(axis=axis_disp)
@@ -22,3 +29,17 @@ def rebuild_axes(self):
         self.remove_widget(self.jog_bar)
         super().rebuild_axes()
         self.add_widget(self.jog_bar)
+    
+    def _update_row_heights(self, *args):
+        num_rows = len(self.axis_bars)
+        if num_rows == 0:
+            return
+
+        available = self.height - self.jog_bar.height
+        row_height = min(available / num_rows, self.app.formats.max_row_height)
+
+        for bar in self.axis_bars:
+            bar.size_hint_y = None
+            bar.height = row_height
+
+        # spacer absorbs remaining space (size_hint_y defaults to 1)

rcp/components/screens/formats_screen.kv

@@ -87,6 +87,10 @@
           value: root.formats.hide_mouse_cursor
           help_file: "hide_mouse_cursor.md"
           on_value: root.formats.hide_mouse_cursor = self.value
+        NumberItem:
+          name: "Max axis row height (px)"
+          value: root.formats.max_row_height
+          on_value: root.formats.max_row_height = self.value
 
         TitleItem:
           name: "Sound Settings"

rcp/dispatchers/formats.py

@@ -51,6 +51,8 @@ class FormatsDispatcher(SavingDispatcher):
 
     hide_mouse_cursor = BooleanProperty(False)
 
+    max_row_height = NumericProperty(150)
+
     def __init__(self, **kv):
         super().__init__(**kv)
         self.angle_speed_format = self.angle_speed_format.replace("RPM", "").replace(" ", "")