Skip to content

Use shadow width instead of custom size #437

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
danirabbit merged 4 commits into from
Jul 27, 2025
Merged

Use shadow width instead of custom size #437

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a81e75
Use shadow width instead of custom size
leolost2605 Jul 27, 2025
f7de287
Fix x size setting
leolost2605 Jul 27, 2025
1e6c290
Merge branch 'main' into leolost/shadow-width
danirabbit Jul 27, 2025
09a4aa5
Update src/MainWindow.vala
leolost2605 Jul 27, 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
26 changes: 11 additions & 15 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
private Pantheon.Desktop.Panel? panel;

private Gtk.Box main_box;
private int height = 0;

class construct {
set_css_name ("dock-window");
Expand Down Expand Up @@ -102,6 +101,16 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {

private static Wl.RegistryListener registry_listener;
private void init_panel () {
((Gdk.Toplevel) get_surface ()).compute_size.connect ((size) => {
// manually set shadow width since the additional margin we add to avoid icons clipping when
// bouncing isn't added by default and instead counts to the frame
unowned var surface = get_surface ();
var item_manager_width = ItemManager.get_default ().get_width ();
var shadow_size = (surface.width - item_manager_width) / 2;
var top_margin = TOP_MARGIN + shadow_size - 1;
size.set_shadow_width (shadow_size, shadow_size, top_margin, shadow_size);
});

get_surface ().layout.connect_after (() => {
// manually set input region since container's shadow are is the content of the window
// and it still gets window events
Expand All @@ -115,19 +124,6 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
item_manager_width,
surface.height - top_margin
}));

var new_height = main_box.get_height ();
if (new_height == height) {
return;
}

height = new_height;

if (panel != null) {
panel.set_size (-1, height);
} else {
update_panel_x11 ();
}
});

registry_listener.global = registry_handle_global;
Expand Down Expand Up @@ -157,7 +153,7 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {

var prop = xdisplay.intern_atom ("_MUTTER_HINTS", false);

var value = "anchor=8:hide-mode=%d:size=-1,%d:restore-previous-region=1".printf (settings.get_enum ("autohide-mode"), height);
var value = "anchor=8:hide-mode=%d:restore-previous-region=1".printf (settings.get_enum ("autohide-mode"));

xdisplay.change_property (window, prop, X.XA_STRING, 8, 0, (uchar[]) value, value.length);
}
Expand Down