Use column.wrap() instead of hand-made grid for Column View

+ Reduced width of Column View items slightly

Author: MikhailValerie

src/tab.rs

@@ -6701,7 +6701,7 @@ impl Tab {
         } = self.config;
         let grid_spacing = space_xxxs;
         let icon_size = icon_sizes.column().max(24); // Prevent icons getting too small
-        let item_width = (160 + grid_spacing + icon_size + grid_spacing) as usize;
+        let item_width = (140 + grid_spacing + icon_size + grid_spacing) as usize;
         let item_height = (grid_spacing + icon_size + grid_spacing) as usize;
 
         let (width, height) = match self.size_opt.get() {
@@ -6732,10 +6732,6 @@ impl Tab {
             Rectangle::new(point, size)
         };
 
-        let mut grid = widget::grid()
-            .column_spacing(grid_spacing)
-            .row_spacing(grid_spacing)
-            .padding(grid_spacing.into());
         let mut dnd_items: Vec<(usize, (usize, usize), &Item)> = Vec::new();
         let mut drag_w_i = usize::MAX;
         let mut drag_n_i = usize::MAX;
@@ -6758,14 +6754,12 @@ impl Tab {
                 let rows_m1 = height_m1 / (item_height + grid_spacing as usize);
                 rows_m1.max(1)
             };
-            let cols = (items_len / rows).max(1) as usize;
-            let mut grid_elements = Vec::with_capacity(rows);
-
 
             // TODO: Load grid content asynchronously, starting with the current view
 
             let mut count = 0;
             let mut hidden = 0;
+            let mut item_elements = Vec::<Element<Message>>::new();
 
             for &(i, item) in &items {
                 // Ignore hidden items if not showing hidden
@@ -6779,11 +6773,6 @@ impl Tab {
                 let col = (count / rows) as usize;
                 let row = (count % rows) as usize;
 
-                // Build the grid rows when cycling through the first column
-                if col == 0 {
-                    grid_elements.push(Vec::with_capacity(cols))
-                }
-
                 // Skip writing contents for items outside the visible viewport
                 item.pos_opt.set(Some((row, col)));
                 let item_rect = Rectangle::new(
@@ -6801,7 +6790,7 @@ impl Tab {
                         .height(Length::Fixed(item_height as f32))
                         .width(Length::Fixed(item_width as f32))
                         .into();
-                    grid_elements[row].push(empty_cell);
+                    item_elements.push(empty_cell);
                     count += 1;
                     continue;
                 }
@@ -6955,7 +6944,7 @@ impl Tab {
                     } else {
                         cell.into()
                     };
-                grid_elements[row].push(cell);
+                item_elements.push(cell);
 
                 if item.selected {
                     dnd_items.push((i, (row, col), item));
@@ -6974,15 +6963,11 @@ impl Tab {
                 return (None, self.empty_view(hidden > 0), None);
             }
 
-            // Write out the visible items to the content grid
-            for row_elements in grid_elements {
-                for element in row_elements {
-                    grid = grid.push(element);
-                }
-                grid = grid.insert_row();
-            }
-
-            column = column.push(grid);
+            column = column.push(
+                widget::column::with_children(item_elements)
+                    .wrap()
+                    .horizontal_spacing(space_xxxs)
+            );
         }
 
         let drag_list = (!dnd_items.is_empty()).then(|| {