From c10fa79a974806f838f4f6d32a6a78bc30ab6564 Mon Sep 17 00:00:00 2001 From: Luca Cuzzocrea Date: Sun, 1 Oct 2023 22:53:08 +0200 Subject: [PATCH] Storage: sorted and made some unimportant mounts smaller --- code/main.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/code/main.cpp b/code/main.cpp index 5861e35..e71d5d7 100644 --- a/code/main.cpp +++ b/code/main.cpp @@ -128,6 +128,13 @@ struct FS_Info Section_Status status; }; +int fs_cmp(const void* a, const void *b) +{ + FS_Entry *fs_a = (FS_Entry*)a; + FS_Entry *fs_b = (FS_Entry*)b; + return strcmp(fs_a->directory, fs_b->directory); +} + System_Info system_info; Network_Info network_info; Virt_Info virt_info; @@ -616,7 +623,7 @@ void fs_gui(Gui_Layout_Grid *grid) Gui_Context *ctx = &global_gui_state.default_context; Rect r = grid->rect_at({4,5}, {2,grid->max_cells_count.y - 5}); - Gui_Layout_Grid layout = gui_layout_grid_create_by_divisions(v2{0,0}, r.size, 1, grid->max_cells_count.y - 5, 0.2*engine.gui_scaling); + Gui_Layout_Grid layout = gui_layout_grid_create_by_divisions(v2{0,0}, r.size, 2, grid->max_cells_count.y - 5, 0.2*engine.gui_scaling); style_select(ctx, fs_info.status); gui_window_start(r, 0xabcdef04); @@ -632,7 +639,11 @@ void fs_gui(Gui_Layout_Grid *grid) for(s32 i = 0; i < fs_info.fs_count; i++) { - Rect r = layout.cell(); + s32 container_size = 2; + if(strcmp(fs_info.fs[i].directory, "/boot") == 0 || strcmp(fs_info.fs[i].directory, "/boot/efi") == 0) + container_size = 1; + + Rect r = layout.cell(container_size); gui_panel(r); Gui_Layout_Grid layout = gui_layout_grid_create_by_divisions(r.position, r.size, 8, 4, 0.1*engine.gui_scaling); @@ -839,6 +850,9 @@ void collect_new_data_if_needed() endmntent(file); + // Sort by mount directory + qsort(fs_info.fs, fs_info.fs_count, sizeof(FS_Entry), fs_cmp); + fs_info.status = SECTION_STATUS_NONE; } }