Merge pull request #2200 from mhsmith/rehint-updates

Android and WinForms rehint updates
beeware · Nov 6, 2023 · bd042ae · bd042ae
2 parents cda9754 + 9d2af8a
commit bd042ae
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 23 deletions.
diff --git a/android/src/toga_android/widgets/progressbar.py b/android/src/toga_android/widgets/progressbar.py
@@ -3,7 +3,6 @@
 from android import R
 from android.view import View
 from android.widget import ProgressBar as A_ProgressBar
-from travertino.size import at_least
 
 from .base import Widget
 
@@ -94,9 +93,6 @@ def rehint(self):
             View.MeasureSpec.UNSPECIFIED,
             View.MeasureSpec.UNSPECIFIED,
         )
-        self.interface.intrinsic.width = self.scale_out(
-            at_least(self.native.getMeasuredWidth()), ROUND_UP
-        )
         self.interface.intrinsic.height = self.scale_out(
             self.native.getMeasuredHeight(), ROUND_UP
         )
diff --git a/android/src/toga_android/widgets/selection.py b/android/src/toga_android/widgets/selection.py
@@ -4,7 +4,6 @@
 from android.view import View
 from android.widget import AdapterView, ArrayAdapter, Spinner
 from java import dynamic_proxy
-from travertino.size import at_least
 
 from .base import Widget
 
@@ -86,9 +85,6 @@ def clear(self):
 
     def rehint(self):
         self.native.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
-        self.interface.intrinsic.width = self.scale_out(
-            at_least(self.native.getMeasuredWidth()), ROUND_UP
-        )
         self.interface.intrinsic.height = self.scale_out(
             self.native.getMeasuredHeight(), ROUND_UP
         )
diff --git a/android/src/toga_android/widgets/slider.py b/android/src/toga_android/widgets/slider.py
@@ -4,7 +4,6 @@
 from android.view import View
 from android.widget import SeekBar
 from java import dynamic_proxy
-from travertino.size import at_least
 
 import toga
 
@@ -69,9 +68,6 @@ def _load_tick_drawable(self):
 
     def rehint(self):
         self.native.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
-        self.interface.intrinsic.width = self.scale_out(
-            at_least(self.native.getMeasuredWidth()), ROUND_UP
-        )
         self.interface.intrinsic.height = self.scale_out(
             self.native.getMeasuredHeight(), ROUND_UP
         )
diff --git a/changes/2200.feature.rst b/changes/2200.feature.rst
@@ -0,0 +1 @@
+Most widgets with flexible sizes now default to a minimum size of 100 CSS pixels. An explicit size will still override this value.
diff --git a/core/src/toga/widgets/scrollcontainer.py b/core/src/toga/widgets/scrollcontainer.py
@@ -6,9 +6,6 @@
 
 
 class ScrollContainer(Widget):
-    _MIN_WIDTH = 0
-    _MIN_HEIGHT = 0
-
     def __init__(
         self,
         id=None,

diff --git a/winforms/src/toga_winforms/widgets/selection.py b/winforms/src/toga_winforms/widgets/selection.py
@@ -2,7 +2,6 @@
 from decimal import ROUND_UP
 
 import System.Windows.Forms as WinForms
-from travertino.size import at_least
 
 from ..libs.wrapper import WeakrefCallable
 from .base import Widget
@@ -78,9 +77,6 @@ def get_selected_index(self):
         return None if index == -1 else index
 
     def rehint(self):
-        self.interface.intrinsic.width = self.scale_out(
-            at_least(self.native.PreferredSize.Width), ROUND_UP
-        )
         self.interface.intrinsic.height = self.scale_out(
             self.native.PreferredSize.Height, ROUND_UP
         )
diff --git a/winforms/src/toga_winforms/widgets/slider.py b/winforms/src/toga_winforms/widgets/slider.py
@@ -1,7 +1,6 @@
 from decimal import ROUND_UP
 
 import System.Windows.Forms as WinForms
-from travertino.size import at_least
 
 from toga.widgets.slider import IntSliderImpl
 
@@ -57,9 +56,6 @@ def set_ticks_visible(self, visible):
         self.native.TickStyle = BOTTOM_RIGHT_TICK_STYLE if visible else NONE_TICK_STYLE
 
     def rehint(self):
-        self.interface.intrinsic.width = self.scale_out(
-            at_least(self.native.PreferredSize.Width), ROUND_UP
-        )
         self.interface.intrinsic.height = self.scale_out(
             self.native.PreferredSize.Height, ROUND_UP
         )