Skip to content

BaseIconGroup: Use FlowBox instead of manual layouting #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 10, 2025
Merged

BaseIconGroup: Use FlowBox instead of manual layouting #484

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
481067b
BaseIconGroup: Use FlowBox instead of manual layouting
leolost2605 Nov 2, 2025
383aea7
Merge branch 'main' into leolost/flow-box
leolost2605 Nov 2, 2025
bd36e0b
Make the icons can_target = false
leolost2605 Nov 9, 2025
c15ebfa
Fix off center single item
leolost2605 Nov 9, 2025
9a6e58b
Use Granite Bin
leolost2605 Nov 9, 2025
e88ace3
Merge branch 'main' into leolost/flow-box
leolost2605 Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ icongroup {
padding-bottom: 0;
}

icongroup .icon-group-box {
icongroup .icon-group-bin {
background: alpha(@base_color, 0.4);
box-shadow:
inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
Expand All @@ -94,7 +94,7 @@ icongroup .icon-group-box {
border-spacing: 3px;
}

.reduce-transparency icongroup box {
.reduce-transparency icongroup bin {
background: @base_color;
}

Expand Down
106 changes: 38 additions & 68 deletions src/BaseIconGroup.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,64 @@
*/

public abstract class Dock.BaseIconGroup : BaseItem {
private class EmptyWidget : Gtk.Widget {}

private const int MAX_IN_ROW = 2;
private const int MAX_N_CHILDREN = MAX_IN_ROW * MAX_IN_ROW;

public ListModel icons { get; construct; }

private Gtk.Grid grid;

class construct {
set_css_name ("icongroup");
}

construct {
grid = new Gtk.Grid () {
hexpand = true,
vexpand = true,
var slice = new Gtk.SliceListModel (icons, 0, MAX_N_CHILDREN);

var flow_box = new Gtk.FlowBox () {
max_children_per_line = MAX_IN_ROW,
min_children_per_line = MAX_IN_ROW,
selection_mode = NONE,
halign = CENTER,
valign = CENTER
valign = CENTER,
};
flow_box.bind_model (slice, create_flow_box_child);
bind_property ("icon-size", flow_box, "row-spacing", SYNC_CREATE, icon_size_to_grid_spacing);
bind_property ("icon-size", flow_box, "column-spacing", SYNC_CREATE, icon_size_to_grid_spacing);

var box = new Gtk.Box (VERTICAL, 0);
box.add_css_class ("icon-group-box");
box.append (grid);

overlay.child = box;

update_icons ();
icons.items_changed.connect (update_icons);
notify["icon-size"].connect (update_icons);
var bin = new Adw.Bin () {
child = flow_box
};
bin.add_css_class ("icon-group-bin");
bind_property ("icon-size", bin, "width-request", SYNC_CREATE);
bind_property ("icon-size", bin, "height-request", SYNC_CREATE);

bind_property ("icon-size", box, "width-request", SYNC_CREATE);
bind_property ("icon-size", box, "height-request", SYNC_CREATE);
overlay.child = bin;
}

private void update_icons () {
unowned Gtk.Widget? child;
while ((child = grid.get_first_child ()) != null) {
grid.remove (child);
}

var grid_spacing = get_grid_spacing ();
grid.row_spacing = grid_spacing;
grid.column_spacing = grid_spacing;

var new_pixel_size = get_pixel_size ();
int i;
for (i = 0; i < uint.min (icons.get_n_items (), 4); i++) {
var image = new Gtk.Image.from_gicon ((Icon) icons.get_item (i)) {
pixel_size = new_pixel_size
};

grid.attach (image, i % MAX_IN_ROW, i / MAX_IN_ROW, 1, 1);
}

// We always need to attach at least 3 elements for grid to be square and properly aligned
for (; i < 3; i++) {
var empty_widget = new EmptyWidget ();
empty_widget.set_size_request (new_pixel_size, new_pixel_size);

grid.attach (empty_widget, i % MAX_IN_ROW, i / MAX_IN_ROW, 1, 1);
}
private static bool icon_size_to_grid_spacing (Binding binding, Value from_value, ref Value to_value) {
var icon_size = from_value.get_int ();
var pixel_size = get_pixel_size (icon_size);
var spacing = (int) Math.round ((icon_size - pixel_size * MAX_IN_ROW) / 3);
to_value.set_uint (spacing);
return true;
}

private int get_pixel_size () {
var pixel_size = 8;
private Gtk.Widget create_flow_box_child (Object? item) {
var image = new Gtk.Image.from_gicon ((Icon) item);
bind_property ("icon-size", image, "pixel-size", SYNC_CREATE, (binding, from_value, ref to_value) => {
var icon_size = from_value.get_int ();
to_value.set_int (get_pixel_size (icon_size));
return true;
});

switch (icon_size) {
case 64:
pixel_size = 24;
break;
case 48:
pixel_size = 16;
break;
case 32:
pixel_size = 8;
break;
default:
pixel_size = (int) Math.round (icon_size / 3);
break;
}

return pixel_size;
return image;
}

private int get_grid_spacing () {
var pixel_size = get_pixel_size ();

return (int) Math.round ((icon_size - pixel_size * MAX_IN_ROW) / 3);
private static int get_pixel_size (int for_icon_size) {
switch (for_icon_size) {
case 64: return 24;
case 48: return 16;
case 32: return 8;
default: return (int) Math.round (for_icon_size / 3);
}
}
}
15 changes: 8 additions & 7 deletions src/WorkspaceSystem/DynamicWorkspaceItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,20 @@ public class Dock.DynamicWorkspaceIcon : BaseItem {
};
add_image.add_css_class ("add-image");

// Gtk.Box is used here to keep css nodes consistent with IconGroup
var box = new Gtk.Box (VERTICAL, 0);
box.add_css_class ("icon-group-box");
box.append (add_image);
// Adw.Bin is used here to keep css nodes consistent with IconGroup
var bin = new Adw.Bin () {
child = add_image
};
bin.add_css_class ("icon-group-bin");

overlay.child = box;
overlay.child = bin;

WorkspaceSystem.get_default ().workspace_added.connect (update_active_state);
WorkspaceSystem.get_default ().workspace_removed.connect (update_active_state);
WindowSystem.get_default ().notify["active-workspace"].connect (update_active_state);

dock_settings.bind ("icon-size", box, "width-request", DEFAULT);
dock_settings.bind ("icon-size", box, "height-request", DEFAULT);
dock_settings.bind ("icon-size", bin, "width-request", DEFAULT);
dock_settings.bind ("icon-size", bin, "height-request", DEFAULT);

dock_settings.bind_with_mapping (
"icon-size", add_image, "pixel_size", DEFAULT | GET,
Expand Down