use ListView for containers

Author: ranfdev

data/gtk/window.ui

@@ -91,15 +91,21 @@
                                   <object class="GtkStackPage">
                                     <property name="name">distroboxes</property>
                                     <property name="child">
-                                      <object class="GtkScrolledWindow">
-                                        <property name="child">
-                                          <object class="GtkListBox" id="sidebar_list_box">
-                                            <property name="selection-mode">single</property>
-                                            <style>
-                                              <class name="navigation-sidebar"/>
-                                            </style>
+                                      <object class="GtkBox">
+                                        <property name="orientation">vertical</property>
+                                        <child>
+                                          <object class="GtkScrolledWindow">
+                                            <property name="hexpand">True</property>
+                                            <property name="vexpand">True</property>
+                                            <property name="child">
+                                              <object class="GtkListView" id="sidebar_list_view">
+                                                <style>
+                                                  <class name="navigation-sidebar"/>
+                                                </style>
+                                              </object>
+                                            </property>
                                           </object>
-                                        </property>
+                                        </child>
                                       </object>
                                     </property>
                                   </object>
@@ -116,7 +122,7 @@
                       </object>
                     </property>
                     <property name="content">
-                      <object class="AdwNavigationPage">
+                      <object class="AdwNavigationPage" id="content_page">
                         <property name="title" translatable="yes">Container</property>
                         <property name="child">
                           <object class="AdwToolbarView">

src/sidebar_row.rs

@@ -25,7 +25,7 @@ mod imp {
         pub status_overlay: gtk::Overlay,
         pub status_dot: gtk::Box,
 
-        #[property(get, set)]
+        #[property(get, set=Self::set_container)]
         pub container: RefCell<Container>,
         #[property(get, set=Self::set_status_tag)]
         pub status_tag: RefCell<String>,
@@ -34,6 +34,22 @@ mod imp {
     }
 
     impl SidebarRow {
+        fn set_container(&self, value: &Container) {
+            self.container.replace(value.clone());
+            // Bind properties
+            value
+                .bind_property("status-tag", &self.obj().clone(), "status-tag")
+                .sync_create()
+                .build();
+            value
+                .bind_property("name", &self.title_label, "label")
+                .sync_create()
+                .build();
+            value
+                .bind_property("image", &self.obj().clone(), "image")
+                .sync_create()
+                .build();
+        }
         fn set_image(&self, value: &str) {
             self.image.replace(value.to_string());
             distro_icon::set_image(&self.icon, value);
@@ -150,23 +166,7 @@ glib::wrapper! {
 impl SidebarRow {
     pub fn new(container: &Container) -> Self {
         let obj: Self = glib::Object::builder().build();
-        obj.set_data(container);
+        obj.set_container(container);
         obj
     }
-
-    fn set_data(&self, container: &Container) {
-        let imp = self.imp();
-        container
-            .bind_property("status-tag", self, "status-tag")
-            .sync_create()
-            .build();
-        container
-            .bind_property("name", &imp.title_label, "label")
-            .sync_create()
-            .build();
-        container
-            .bind_property("image", self, "image")
-            .sync_create()
-            .build();
-    }
 }

src/store/root_store.rs

@@ -130,8 +130,7 @@ mod imp {
         pub containers_query: Query<Vec<Container>>,
 
         pub containers: TypedListStore<Container>,
-        #[property(get, set, nullable)]
-        selected_container: RefCell<Option<crate::container::Container>>,
+        pub selected_container_model: OnceCell<gtk::SingleSelection>,
 
         pub tasks: TypedListStore<DistroboxTask>,
         #[property(get, set, nullable)]
@@ -154,7 +153,7 @@ mod imp {
                 terminal_repository: RefCell::new(TerminalRepository::new(
                     CommandRunner::new_null(),
                 )),
-                selected_container: Default::default(),
+                selected_container_model: OnceCell::new(),
                 current_view: Default::default(),
                 current_dialog: Default::default(),
                 distrobox: Default::default(),
@@ -203,6 +202,14 @@ impl RootStore {
             .or(Err("distrobox already set"))
             .unwrap();
 
+        // Initialize the SingleSelection model
+        let selection = gtk::SingleSelection::new(Some(this.containers().inner().clone()));
+        this.imp()
+            .selected_container_model
+            .set(selection)
+            .or(Err("selected_container_model already set"))
+            .unwrap();
+
         let this_clone = this.clone();
         this.imp().distrobox_version.set_fetcher(move || {
             let this_clone = this_clone.clone();
@@ -242,20 +249,13 @@ impl RootStore {
         let this_clone = this.clone();
         this.containers_query().connect_success(move |containers| {
             let this = this_clone.clone();
-            let previous_selected = this.selected_container().clone();
 
             reconcile_list_by_key(
                 this.containers(),
                 &containers[..],
                 |item| item.name(),
                 &["name", "status-tag", "status-detail", "distro", "image"],
             );
-            
-            if previous_selected.is_none() {
-                if let Some(first) = containers.first() {
-                    this.set_selected_container(Some(first.clone()));
-                }
-            }
         });
 
         if this.selected_terminal().is_none() {
@@ -306,6 +306,21 @@ impl RootStore {
         &self.imp().tasks
     }
 
+    pub fn selected_container_model(&self) -> gtk::SingleSelection {
+        self.imp().selected_container_model.get().unwrap().clone()
+    }
+
+    /// Get the currently selected container, if any
+    pub fn selected_container(&self) -> Option<Container> {
+        let model = self.selected_container_model();
+        let position = model.selected();
+        if position == gtk::INVALID_LIST_POSITION {
+            None
+        } else {
+            model.selected_item().and_then(|obj| obj.downcast::<Container>().ok())
+        }
+    }
+
     pub fn load_containers(&self) {
         self.containers_query().refetch_if_stale(Duration::from_secs(1));
     }