From cdcc2f676603467dd23b18d71272115a3873353a Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Sat, 21 Feb 2026 22:31:05 -0800
Subject: [PATCH] mici scroller: remove double pad args (#37315)

* remove double pad args

* fix
---
 selfdrive/ui/mici/layouts/main.py           |  2 +-
 selfdrive/ui/mici/layouts/offroad_alerts.py |  2 +-
 selfdrive/ui/mici/widgets/dialog.py         |  2 +-
 system/ui/widgets/scroller.py               | 10 ++++------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/selfdrive/ui/mici/layouts/main.py b/selfdrive/ui/mici/layouts/main.py
index be2c4747f3..928ea942da 100644
--- a/selfdrive/ui/mici/layouts/main.py
+++ b/selfdrive/ui/mici/layouts/main.py
@@ -40,7 +40,7 @@ class MiciMainLayout(Widget):
       self._alerts_layout,
       self._home_layout,
       self._onroad_layout,
-    ], spacing=0, pad_start=0, pad_end=0, scroll_indicator=False, edge_shadows=False)
+    ], spacing=0, pad=0, scroll_indicator=False, edge_shadows=False)
     self._scroller.set_reset_scroll_at_show(False)
     self._scroller.set_enabled(lambda: self.enabled)  # for nav stack
 
diff --git a/selfdrive/ui/mici/layouts/offroad_alerts.py b/selfdrive/ui/mici/layouts/offroad_alerts.py
index 60f64b31b0..778d718552 100644
--- a/selfdrive/ui/mici/layouts/offroad_alerts.py
+++ b/selfdrive/ui/mici/layouts/offroad_alerts.py
@@ -197,7 +197,7 @@ class MiciOffroadAlerts(Widget):
     self._last_refresh = 0.0
 
     # Create vertical scroller
-    self._scroller = Scroller([], horizontal=False, spacing=12, pad_start=0, pad_end=0, snap_items=False)
+    self._scroller = Scroller([], horizontal=False, spacing=12, pad=0, snap_items=False)
 
     # Create empty state label
     self._empty_label = UnifiedLabel(tr("no alerts"), 65, FontWeight.DISPLAY, rl.WHITE,
diff --git a/selfdrive/ui/mici/widgets/dialog.py b/selfdrive/ui/mici/widgets/dialog.py
index f57938c8ee..8a1c5df65f 100644
--- a/selfdrive/ui/mici/widgets/dialog.py
+++ b/selfdrive/ui/mici/widgets/dialog.py
@@ -297,7 +297,7 @@ class BigMultiOptionDialog(BigDialogBase):
     # Widget doesn't differentiate between click and drag
     self._can_click = True
 
-    self._scroller = Scroller([], horizontal=False, pad_start=100, pad_end=100, spacing=0, snap_items=True)
+    self._scroller = Scroller([], horizontal=False, pad=100, spacing=0, snap_items=True)
 
     for option in options:
       self._scroller.add_widget(BigDialogOptionButton(option))
diff --git a/system/ui/widgets/scroller.py b/system/ui/widgets/scroller.py
index f5d5738e9c..94e00872d2 100644
--- a/system/ui/widgets/scroller.py
+++ b/system/ui/widgets/scroller.py
@@ -63,15 +63,13 @@ class ScrollIndicator(Widget):
 
 class Scroller(Widget):
   def __init__(self, items: list[Widget], horizontal: bool = True, snap_items: bool = True, spacing: int = ITEM_SPACING,
-               pad_start: int = ITEM_SPACING, pad_end: int = ITEM_SPACING,
-               scroll_indicator: bool = True, edge_shadows: bool = True):
+               pad: int = ITEM_SPACING, scroll_indicator: bool = True, edge_shadows: bool = True):
     super().__init__()
     self._items: list[Widget] = []
     self._horizontal = horizontal
     self._snap_items = snap_items
     self._spacing = spacing
-    self._pad_start = pad_start
-    self._pad_end = pad_end
+    self._pad = pad
 
     self._reset_scroll_at_show = True
 
@@ -200,7 +198,7 @@ class Scroller(Widget):
 
     self._content_size = sum(item.rect.width if self._horizontal else item.rect.height for item in self._visible_items)
     self._content_size += self._spacing * (len(self._visible_items) - 1)
-    self._content_size += self._pad_start + self._pad_end
+    self._content_size += self._pad * 2
 
     self._scroll_offset = self._get_scroll(self._visible_items, self._content_size)
 
@@ -208,7 +206,7 @@ class Scroller(Widget):
 
     cur_pos = 0
     for idx, item in enumerate(self._visible_items):
-      spacing = self._spacing if (idx > 0) else self._pad_start
+      spacing = self._spacing if (idx > 0) else self._pad
       # Nicely lay out items horizontally/vertically
       if self._horizontal:
         x = self._rect.x + cur_pos + spacing