rebase

Author: alanpoon

src/app.rs

@@ -192,7 +192,6 @@ impl MatchEvent for App {
         self.update_login_visibility(cx);
 
         log!("App::handle_startup(): starting matrix sdk loop");
-        self.app_state.search_widget = Some(self.ui.search_bar(id!(home_screen_search_bar)).widget_uid());
         crate::sliding_sync::start_matrix_tokio().unwrap();
     }
 
@@ -310,9 +309,6 @@ impl MatchEvent for App {
                 self.ui.modal(id!(verification_modal)).close(cx);
             }
 
-            if let Some(SearchResultAction::Close) = action.downcast_ref() {
-                self.ui.search_bar(id!(home_screen_search_bar)).text_input(id!(input)).set_text(cx, "");
-            }
             // // message source modal handling.
             // match action.as_widget_action().cast() {
             //     MessageAction::MessageSourceModalOpen { room_id: _, event_id: _, original_json: _ } => {
@@ -401,10 +397,6 @@ pub struct AppState {
     pub logged_in: bool,
     /// The current window geometry.
     pub window_geom: Option<event::WindowGeom>,
-    /// Main Desktop Ui's search widget uid.
-    /// Room screens will get this widget uid to differentiate search action 
-    /// from search bar widget.
-    pub search_widget: Option<WidgetUid>,
 }
 
 /// A saved instance of the state of the main desktop UI's dock.

src/home/home_screen.rs

@@ -31,7 +31,6 @@ live_design! {
             <View> {
                 flow: Down
                 width: Fill, height: Fill
-                home_screen_search_bar = <SearchBar> {}
 
                 <CachedWidget> {
                     <RoomFilterInputBar> { }

src/home/main_desktop_ui.rs

@@ -2,10 +2,8 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 use std::collections::HashMap;
 
-use crate::{app::{AppState, AppStateAction, SelectedRoom}, utils::room_name_or_id};
+use crate::{app::{AppState, AppStateAction, SelectedRoom}, shared::room_filter_input_bar::RoomFilterAction, utils::room_name_or_id};
 use super::{invite_screen::InviteScreenWidgetRefExt, room_screen::RoomScreenWidgetRefExt, rooms_list::RoomsListAction};
-
-use super::{room_screen::RoomScreenWidgetRefExt, room_search_result::SearchResultAction};
 live_design! {
     use link::theme::*;
     use link::shaders::*;
@@ -211,7 +209,7 @@ impl MainDesktopUI {
         dock.close_tab(cx, tab_id);
         self.tab_to_close = None;
         self.open_rooms.remove(&tab_id);
-        cx.action(SearchResultAction::Close);
+        cx.widget_action(self.widget_uid(), &Scope::empty().path, RoomFilterAction::Clear);
     }
 
     /// Replaces an invite with a joined room in the dock.

src/home/new_message_context_menu.rs

@@ -282,28 +282,6 @@ bitflags! {
     }
 }
 impl MessageAbilities {
-    // pub fn from_user_power_and_event(
-    //     user_power_levels: &UserPowerLevels,
-    //     event_tl_item: &EventTimelineItem,
-    //     _message: &MessageOrSticker,
-    //     has_html: bool,
-    // ) -> Self {
-    //     let mut abilities = Self::empty();
-    //     abilities.set(Self::CanEdit, event_tl_item.is_editable());
-    //     // Currently we only support deleting one's own messages.
-    //     if event_tl_item.is_own() {
-    //         abilities.set(Self::CanDelete, user_power_levels.can_redact_own());
-    //     }
-    //     abilities.set(Self::CanReplyTo, event_tl_item.can_be_replied_to());
-    //     abilities.set(Self::CanPin, user_power_levels.can_pin());
-    //     // TODO: currently we don't differentiate between pin and unpin,
-    //     //       but we should first check whether the given message is already pinned
-    //     //       before deciding which ability to set.
-    //     // abilities.set(Self::CanUnPin, user_power_levels.can_pin_unpin());
-    //     abilities.set(Self::CanReact, user_power_levels.can_send_reaction());
-    //     abilities.set(Self::HasHtml, has_html);
-    //     abilities
-    // }
     pub fn from_user_power_and_event_generic<T: Eventable, M: MsgTypeAble>(
         user_power_levels: &UserPowerLevels,
         event_tl_item: &T,