Merge branch 'main' into search_messages_3#122

Author: alanpoon

Cargo.lock

@@ -12,12 +12,13 @@ keywords = ["matrix", "chat", "client", "robrix", "robius"]
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/project-robius/robrix"
-version = "0.0.1-pre-alpha-2"
+version = "0.0.1-pre-alpha-3"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "rik" }
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "robrix_dock_tab_replace" }
+# makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "new_makepad_dev_robrix" }
+# makepad-widgets = { path = "../makepad/widgets" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"
@@ -50,7 +51,6 @@ tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
 tracing-subscriber = "0.3.17"
 unicode-segmentation = "1.11.0"
 url = "2.5.0"
-emojis = "0.6.1"
 bytesize = "1.3.0"
 bitflags = "2.6.0"
 indexmap = "2.6.0"

Cargo.toml

@@ -102,9 +102,13 @@ live_design! {
         ui: <Window> {
             window: {inner_size: vec2(1280, 800), title: "Robrix"},
             caption_bar = {caption_label = {label = {text: "Robrix"}}}
-            pass: {clear_color: #2A}
+            // pass: {clear_color: #2A}
+            pass: {clear_color: #FFFFFF00}
+            // pass: { clear_color: (THEME_COLOR_BG_APP) }
 
             body = {
+                padding: 0,
+
                 // A wrapper view for showing top-level app modals/dialogs/popups
                 <View> {
                     width: Fill, height: Fill,
@@ -130,12 +134,6 @@ live_design! {
                     // but beneath the verification modal.
                     new_message_context_menu = <NewMessageContextMenu> { }
 
-                    // message_source_modal = <Modal> {
-                    //     content: {
-                    //         message_source_modal_inner = <MessageSourceModal> {}
-                    //     }
-                    // }
-
                     // We want the verification modal to always show up on top of
                     // all other elements when an incoming verification request is received.
                     verification_modal = <Modal> {