Merge branch 'bookmark-manager-improvement' into 'main'

chore: Turn show_bookmark into Window specific

See merge request verso-browser/verso!330

Author: pewsheen

src/compositor.rs

@@ -187,9 +187,6 @@ pub struct IOCompositor {
     /// will want to avoid blocking on UI events, and just
     /// run the event loop at the vsync interval.
     pub is_animating: bool,
-
-    /// Show the bookmark bar or not
-    pub show_bookmark: bool,
 }
 
 #[derive(Clone, Copy)]
@@ -373,7 +370,6 @@ impl IOCompositor {
             last_animation_tick: Instant::now(),
             is_animating: false,
             ready_to_present: false,
-            show_bookmark: false,
         };
 
         // Make sure the GL state is OK
@@ -1259,7 +1255,7 @@ impl IOCompositor {
 
         let rect = DeviceRect::from_size(size);
         let show_tab_bar = window.tab_manager.count() > 1;
-        let content_size = window.get_content_size(rect, show_tab_bar, self.show_bookmark);
+        let content_size = window.get_content_size(rect, show_tab_bar, window.show_bookmark);
         if let Some(tab_id) = window.tab_manager.current_tab_id() {
             let (tab_id, prompt_id) = window.tab_manager.set_size(tab_id, content_size);
             if let Some(tab_id) = tab_id {

src/verso.rs

@@ -321,7 +321,6 @@ impl Verso {
             window.create_tab(
                 &constellation_sender,
                 initial_url.into(),
-                compositor.show_bookmark,
             );
         }
 

src/webview/webview.rs

@@ -396,7 +396,7 @@ impl Window {
                     text,
                     multiline,
                     position,
-                    compositor.show_bookmark,
+                    self.show_bookmark,
                 );
             }
             EmbedderMsg::HideIME(_webview_id) => {
@@ -450,7 +450,6 @@ impl Window {
                     self.create_tab(
                         sender,
                         self.panel.as_ref().unwrap().initial_url.clone(),
-                        compositor.show_bookmark,
                     );
                 } else {
                     log::trace!("Verso Panel ignores NotifyLoadStatusChanged status: {status:?}");
@@ -509,7 +508,7 @@ impl Window {
                             let size = self.size();
                             let rect = DeviceRect::from_size(size);
                             let content_size =
-                                self.get_content_size(rect, true, compositor.show_bookmark);
+                                self.get_content_size(rect, true, self.show_bookmark);
                             let size = content_size.size().to_f32() / hidpi_scale_factor;
                             let webview = WebView::new(
                                 webview_id,
@@ -603,11 +602,11 @@ impl Window {
                                             );
                                         }
 
-                                        compositor.show_bookmark =
+                                        self.show_bookmark =
                                             !bookmark_manager.bookmarks().is_empty();
                                         // We need to refresh the window if the need for bookmark to be displayed
                                         // has changed.
-                                        if bookmark_previously_shown != compositor.show_bookmark {
+                                        if bookmark_previously_shown != self.show_bookmark {
                                             compositor.resize(self.size(), self);
                                         }
                                     }

src/window.rs

@@ -102,6 +102,8 @@ pub struct Window {
     pub(crate) focused_webview_id: Option<WebViewId>,
     /// Window-wide menu. e.g. context menu(Wayland) and browsing history menu.
     pub(crate) webview_menu: Option<Box<dyn WebViewMenu>>,
+    /// Show the bookmark bar or not
+    pub show_bookmark: bool,
 }
 
 impl Window {
@@ -153,6 +155,7 @@ impl Window {
                 tab_manager: TabManager::new(),
                 focused_webview_id: None,
                 webview_menu: None,
+                show_bookmark: false
             },
             rendering_context,
         )
@@ -198,6 +201,7 @@ impl Window {
             tab_manager: TabManager::new(),
             focused_webview_id: None,
             webview_menu: None,
+            show_bookmark: false
         };
         compositor.swap_current_window(&mut window);
         window
@@ -261,14 +265,13 @@ impl Window {
         &mut self,
         constellation_sender: &Sender<EmbedderToConstellationMessage>,
         initial_url: ServoUrl,
-        show_bookmark: bool,
     ) {
         let webview_id = WebViewId::new();
         let size = self.size().to_f32();
         let rect = DeviceRect::from_size(size);
 
         let show_tab = self.tab_manager.count() >= 1;
-        let content_size = self.get_content_size(rect, show_tab, show_bookmark);
+        let content_size = self.get_content_size(rect, show_tab, self.show_bookmark);
 
         let hidpi_scale_factor = Scale::new(self.scale_factor() as f32);
         let size = content_size.size().to_f32() / hidpi_scale_factor;
@@ -337,7 +340,7 @@ impl Window {
     ) {
         let size = self.size().to_f32();
         let rect = DeviceRect::from_size(size);
-        let content_size = self.get_content_size(rect, show_tab, compositor.show_bookmark);
+        let content_size = self.get_content_size(rect, show_tab, self.show_bookmark);
         let (tab_id, prompt_id) = self.tab_manager.set_size(tab_id, content_size);
 
         if let Some(prompt_id) = prompt_id {
@@ -695,7 +698,6 @@ impl Window {
                     (*self).create_tab(
                         &compositor.constellation_chan,
                         ServoUrl::parse("https://example.com").unwrap(),
-                        compositor.show_bookmark,
                     );
                     return true;
                 }