Merge branch 'main' into fix271

project-robius · Jan 17, 2025 · 0ab1e95 · 0ab1e95
2 parents 42526ac + c60fa96
commit 0ab1e95
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,8 @@ version = "0.0.1-pre-alpha"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
+# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "hits_without_mark_as_handled" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"

diff --git a/src/home/room_preview.rs b/src/home/room_preview.rs
@@ -155,7 +155,7 @@ live_design! {
                 avatar = <Avatar> {}
                 <View> {
                     flow: Right
-                    width: Fill, height: 60
+                    width: Fill, height: 56
                     align: { x: 0.5, y: 0.5 }
                     left = <View> {
                         width: Fill, height: Fill,