Merge pull request #559 from alanpoon/upgrade_makepad

kevinaboos · web-flow · commit acc926290978 · 2025-07-28T11:41:52.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,6 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
 makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev" }
-#makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "portal_list_is_filling_viewport" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"
diff --git a/src/shared/icon_button.rs b/src/shared/icon_button.rs
@@ -110,5 +110,6 @@ live_design! {
                 return self.color;
             }
         }
+        text: ""
     }
 }
diff --git a/src/shared/styles.rs b/src/shared/styles.rs
@@ -166,19 +166,7 @@ live_design! {
             color_empty: (COLOR_PRIMARY)
             color_disabled: (COLOR_BG_DISABLED)
 
-            border_color_1: (COLOR_PRIMARY)
-            border_color_1_hover: (COLOR_PRIMARY)
-            border_color_1_focus: (COLOR_PRIMARY)
-            border_color_1_down: (COLOR_PRIMARY)
-            border_color_1_empty: (COLOR_PRIMARY)
-            border_color_1_disabled: (COLOR_FG_DISABLED)
-
-            border_color_2: (COLOR_PRIMARY)
-            border_color_2_hover: (COLOR_PRIMARY)
-            border_color_2_focus: (COLOR_PRIMARY)
-            border_color_2_down: (COLOR_PRIMARY)
-            border_color_2_empty: (COLOR_PRIMARY)
-            border_color_2_disabled: (COLOR_FG_DISABLED)
+            border_color: (COLOR_PRIMARY)
         }
 
         draw_selection: {

Original file line number	Diff line number	Diff line change
`@@ -110,5 +110,6 @@ live_design! {`
`110`	`110`	`return self.color;`
`111`	`111`	`}`
`112`	`112`	`}`
	`113`	`+ text: ""`
`113`	`114`	`}`
`114`	`115`	`}`