Skip to content

Fix icons clipping when bouncing #307

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

Closed
wants to merge 6 commits into from
Closed

Fix icons clipping when bouncing #307

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ae3fc8
Fix icons clipping when bouncing
leolost2605 Nov 2, 2024
8bd6e54
Merge branch 'main' into leolost/fix-clip
stsdc Nov 10, 2024
ff7a385
Merge branch 'main' into leolost/fix-clip
zeebok Nov 18, 2024
ee3456f
Merge branch 'main' into leolost/fix-clip
zeebok Nov 30, 2024
979a6a7
Merge branch 'main' into leolost/fix-clip
zeebok Dec 2, 2024
e08537f
Merge branch 'main' into leolost/fix-clip
zeebok Dec 6, 2024
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
2 changes: 1 addition & 1 deletion data/Application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dock {
0 1px 3px alpha(black, 0.10),
0 3px 9px alpha(black, 0.15);
margin: 9px;
margin-top: 0;
margin-top: 32px; /* Keep enough room so that icons don't clip when bouncing */
}

launcher {
Expand Down
21 changes: 20 additions & 1 deletion src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
*/

public class Dock.MainWindow : Gtk.ApplicationWindow {
private const int WINDOW_BOTTOM_MARGIN = 9;

private static Settings settings = new Settings ("io.elementary.dock");

private Pantheon.Desktop.Shell? desktop_shell;
private Pantheon.Desktop.Panel? panel;

private int height = 0;

class construct {
set_css_name ("dock");
}
Expand Down Expand Up @@ -51,6 +55,21 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {

private static Wl.RegistryListener registry_listener;
private void init_panel () {
get_surface ().layout.connect_after (() => {
var new_height = get_height ();
if (new_height == height) {
return;
}

height = new_height;

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

registry_listener.global = registry_handle_global;
unowned var display = Gdk.Display.get_default ();
if (display is Gdk.Wayland.Display) {
Expand Down Expand Up @@ -78,7 +97,7 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {

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

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

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