ui: Don’t override label gravity for text-only buttons.

There are at least two bugs/design flaws still here, but at least this helps with text-only buttons working as expected.
kpreid · Nov 28, 2024 · 13bcc3a · 13bcc3a
1 parent 2863482
commit 13bcc3a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/all-is-cubes-ui/src/vui/widgets/button.rs b/all-is-cubes-ui/src/vui/widgets/button.rs
@@ -63,8 +63,11 @@ impl ButtonLabel {
     /// Always has as many elements as `requirements().minimum`.
     fn blocks(&self, mut gravity: vui::Gravity) -> impl Iterator<Item = Block> + '_ {
         // TODO: need a better plan for how gravity interacts with icons;
-        // this is a kludge to get okay layout of the text for now
-        gravity.x = vui::Align::Low;
+        // this is a kludge to get okay layout of the text for now, by left-aligning the
+        // text to meet the icon.
+        if self.icon.is_some() {
+            gravity.x = vui::Align::Low;
+        }
 
         self.icon
             .clone()

diff --git a/test-renderers/expected/ui/widget_button_action-2-all.png b/test-renderers/expected/ui/widget_button_action-2-all.png
diff --git a/test-renderers/expected/ui/widget_button_toggle-2-all.png b/test-renderers/expected/ui/widget_button_toggle-2-all.png
diff --git a/test-renderers/expected/ui/widget_button_toggle-all.png b/test-renderers/expected/ui/widget_button_toggle-all.png