Added remove_timeline_loaded_notify

Author: alanpoon

src/app.rs

@@ -18,11 +18,11 @@ use crate::{
     },
     login::login_screen::LoginAction,
     persistence,
-    shared::{callout_tooltip::{
+    shared::callout_tooltip::{
         CalloutTooltipOptions,
         CalloutTooltipWidgetRefExt,
         TooltipAction,
-    }, message_search_input_bar::MessageSearchAction},
+    },
     sliding_sync::current_user_id,
     utils::{
         room_name_or_id,
@@ -164,8 +164,7 @@ impl LiveRegister for App {
         crate::settings::live_design(cx);
         crate::room::live_design(cx);
         crate::join_leave_room_modal::live_design(cx);
-        crate::right_panel::live_design(cx);
-        crate::right_panel::search_message::live_design(cx);
+        crate::right_drawer::live_design(cx);
         crate::verification_modal::live_design(cx);
         crate::home::live_design(cx);
         crate::profile::live_design(cx);
@@ -373,13 +372,6 @@ impl MatchEvent for App {
             //     }
             //     _ => {}
             // }
-            if let MessageSearchAction::Clicked = action.as_widget_action().cast() {
-                cx.widget_action(
-                    self.ui.widget_uid(),
-                    &Scope::default().path,
-                    StackNavigationAction::Push(live_id!(search_result_view))
-                );
-            }
         }
     }
 }

src/home/home_screen.rs

@@ -1,6 +1,6 @@
 use makepad_widgets::*;
 
-use crate::{settings::{settings_screen::SettingsScreenWidgetRefExt, SettingsAction}, shared::message_search_input_bar::{MessageSearchInputBarRef, MessageSearchInputBarWidgetExt}};
+use crate::{settings::{settings_screen::SettingsScreenWidgetRefExt, SettingsAction}, shared::message_search_input_bar::{MessageSearchAction, MessageSearchInputBarRef, MessageSearchInputBarWidgetExt}};
 
 live_design! {
     use link::theme::*;
@@ -15,8 +15,9 @@ live_design! {
     use crate::shared::message_search_input_bar::MessageSearchInputBar;
     use crate::shared::icon_button::RobrixIconButton;
     use crate::home::main_desktop_ui::MainDesktopUI;
+    use crate::home::search_message::SearchResultStackView;
     use crate::settings::settings_screen::SettingsScreen;
-    use crate::right_panel::*;
+    use crate::right_drawer::RightDrawer;
 
     NavigationWrapper = {{NavigationWrapper}} {
         view_stack = <StackNavigation> {}
@@ -82,7 +83,7 @@ live_design! {
                             flow: Right
 
                             <MainDesktopUI> {}
-                            <RightPanel> {}
+                            <RightDrawer> {}
                         }
                     }
 
@@ -176,7 +177,7 @@ live_design! {
                                 main_content = <MainMobileUI> {}
                             }
                         }
-                        search_result_view = <SearchResultView> {
+                        search_result_view = <SearchResultStackView> {
                             flow: Overlay
                             header = {
                                 height: 50.0,
@@ -271,6 +272,18 @@ impl Widget for HomeScreen {
                     },
                     MessageSearchInputAction::Hide => self.view.view(id!(message_search_input_view)).set_visible(cx, false),
                 }
+
+                if let MessageSearchAction::Clicked = action.as_widget_action().cast() {
+                    if !self.view
+                        .stack_navigation(id!(view_stack))
+                        .stack_view_ids().contains(&live_id!(search_result_view)) {
+                            cx.widget_action(
+                                self.widget_uid(),
+                                &Scope::default().path,
+                                StackNavigationAction::Push(live_id!(search_result_view))
+                            );
+                        }
+                }
             }
         }
 

src/home/mod.rs

@@ -19,6 +19,7 @@ pub mod spaces_dock;
 pub mod welcome_screen;
 pub mod event_reaction_list;
 pub mod new_message_context_menu;
+pub mod search_message;
 
 pub fn live_design(cx: &mut Cx) {
     home_screen::live_design(cx);
@@ -40,4 +41,5 @@ pub fn live_design(cx: &mut Cx) {
     welcome_screen::live_design(cx);
     light_themed_dock::live_design(cx);
     event_reaction_list::live_design(cx);
+    search_message::live_design(cx);
 }