Skip to content

Small cleanup #459

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 2 commits into from
Sep 17, 2025
Merged

Small cleanup #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a094f6b
Small cleanup
lenemter Sep 17, 2025
94ed9a5
Merge branch 'main' into lenemter/cleanup
danirabbit Sep 17, 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
8 changes: 3 additions & 5 deletions src/ItemManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
private GLib.GenericArray<WorkspaceIconGroup> icon_groups; // Only used to keep track of icon group indices
private DynamicWorkspaceIcon dynamic_workspace_item;

#if WORKSPACE_SWITCHER
private Gtk.Separator separator;
#endif

static construct {
settings = new Settings ("io.elementary.dock");
Expand Down Expand Up @@ -52,11 +54,7 @@

resize_animation.done.connect (() => width_request = -1); //Reset otherwise we stay to big when the launcher icon size changes

settings.changed.connect ((key) => {
if (key == "icon-size") {
reposition_items ();
}
});
settings.changed["icon-size"].connect (reposition_items);

var drop_target_file = new Gtk.DropTarget (typeof (File), COPY) {
preload = true
Expand Down
14 changes: 7 additions & 7 deletions src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

public class Dock.MainWindow : Gtk.ApplicationWindow {
private class Container : Gtk.Box {
private class Container : Gtk.Widget {
class construct {
set_css_name ("dock");
}
Expand Down Expand Up @@ -113,28 +113,28 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {

private static Wl.RegistryListener registry_listener;
private void init_panel () {
((Gdk.Toplevel) get_surface ()).compute_size.connect ((size) => {
unowned var surface = (Gdk.Toplevel) get_surface ();

surface.compute_size.connect ((surface, 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 (() => {
surface.layout.connect ((surface, width, height) => {
// manually set input region since container's shadow are is the content of the window
// and it still gets window events
unowned var surface = get_surface ();
var item_manager_width = ItemManager.get_default ().get_width ();
var shadow_size = (surface.width - item_manager_width) / 2;
var shadow_size = (width - item_manager_width) / 2;
var top_margin = TOP_MARGIN + shadow_size;
surface.set_input_region (new Cairo.Region.rectangle ({
shadow_size,
top_margin,
item_manager_width,
surface.height - top_margin
height - top_margin
}));

if (initialized_blur) {
Expand Down