fix: some fixes

tsukinaha · Apr 1, 2024 · 6805baf · 6805baf
1 parent 0c9d69f
commit 6805baf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/resources/ui/list.ui b/resources/ui/list.ui
@@ -32,19 +32,19 @@
                             <attributes>
                               <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
                             </attributes>
-                            <property name="halign">center</property>
+                            <property name="halign">start</property>
                             <property name="margin-top">12</property>
+                            <property name="margin-start">55</property>
                           </object>
                         </child>
                         <child>
-                          <object class="AdwClamp">
+                          <object class="GtkScrolledWindow" id="listscrolled">
+                            <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
                             <child>
-                              <object class="GtkScrolledWindow" id="listscrolled">
-                                <child>
-                                  <object class="GtkGridView" id="listgrid">
-                                  </object>
-                                </child>
+                              <object class="GtkGridView" id="listgrid">
+                              <property name="margin-start">40</property>
+                              <property name="margin-end">40</property>
                               </object>
                             </child>
                           </object>

diff --git a/resources/ui/window.ui b/resources/ui/window.ui
@@ -12,8 +12,8 @@
   </menu>
   <template class="AppWindow" parent="AdwApplicationWindow">
     <property name="title" translatable="yes">Login</property>
-    <property name="width-request">880</property>
-    <property name="height-request">550</property>
+    <property name="width-request">1280</property>
+    <property name="height-request">920</property>
     <child>
       <object class="AdwBreakpoint">
         <condition>max-width: 500sp</condition>

diff --git a/src/ui/widgets/list.rs b/src/ui/widgets/list.rs
@@ -242,8 +242,8 @@ impl ListPage {
         });
         imp.listgrid.set_factory(Some(&factory));
         imp.listgrid.set_model(Some(&imp.selection));
-        imp.listgrid.set_min_columns(4);
-        imp.listgrid.set_max_columns(4);
+        imp.listgrid.set_min_columns(3);
+        imp.listgrid.set_max_columns(13);
         imp.listgrid.connect_activate(glib::clone!(@weak self as obj => move |gridview, position| {
             let model = gridview.model().unwrap();
             let item = model.item(position).and_downcast::<glib::BoxedAnyObject>().unwrap();
@@ -280,7 +280,6 @@ impl ListPage {
 
     pub fn update(&self) {
         let scrolled = self.imp().listscrolled.get();
-        let mut offset = 50;
         scrolled.connect_edge_reached(glib::clone!(@weak self as obj => move |_, pos| {
             if pos == gtk::PositionType::Bottom {
                 let spinner = obj.imp().spinner.get();
@@ -289,7 +288,7 @@ impl ListPage {
                 let store = obj.imp().selection.model().unwrap().downcast::<gio::ListStore>().unwrap();
                 let id = obj.imp().id.get().expect("id not set").clone();
                 let mutex = std::sync::Arc::new(tokio::sync::Mutex::new(()));
-
+                let offset = obj.imp().selection.model().unwrap().n_items();
                 crate::ui::network::runtime().spawn(glib::clone!(@strong sender => async move {
                     let list_results = crate::ui::network::get_list(id.to_string(),offset.to_string(),mutex).await.unwrap_or_else(|e| {
                         eprintln!("Error: {}", e);
@@ -303,7 +302,6 @@ impl ListPage {
                             let object = glib::BoxedAnyObject::new(result);
                             store.append(&object);
                         }
-                        offset += 50;
                         spinner.set_visible(false);
                     }
                 }));