Skip to content

Commit dd03211

Browse files
authored
Merge branch 'main' into lenemter/rework-size-system
2 parents d16513a + 588ddeb commit dd03211

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/AppSystem/Launcher.vala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,9 @@ public class Dock.Launcher : BaseItem {
199199
gesture_click.button = 0;
200200
gesture_click.released.connect (on_click_released);
201201

202-
var long_press = new Gtk.GestureLongPress ();
202+
var long_press = new Gtk.GestureLongPress () {
203+
touch_only = true
204+
};
203205
long_press.pressed.connect (() => {
204206
popover_menu.popup ();
205207
popover_tooltip.popdown ();

src/MainWindow.vala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
107107

108108
private static Wl.RegistryListener registry_listener;
109109
private void init_panel () {
110-
var surface = (Gdk.Toplevel) get_surface ();
110+
unowned var surface = (Gdk.Toplevel) get_surface ();
111111

112112
surface.compute_size.connect ((surface, size) => {
113113
// manually set shadow width since the additional margin we add to avoid icons clipping when
@@ -118,12 +118,10 @@ public class Dock.MainWindow : Gtk.ApplicationWindow {
118118
size.set_shadow_width (shadow_size, shadow_size, top_margin, shadow_size);
119119
});
120120

121-
surface.layout.connect_after ((surface, width, height) => {
122-
unowned var item_manager = ItemManager.get_default ();
123-
var item_manager_width = item_manager.get_width ();
124-
121+
surface.layout.connect ((surface, width, height) => {
125122
// manually set input region since container's shadow are is the content of the window
126123
// and it still gets window events
124+
var item_manager_width = ItemManager.get_default ().get_width ();
127125
var shadow_size = (width - item_manager_width) / 2;
128126
var top_margin = TOP_MARGIN + shadow_size;
129127
surface.set_input_region (new Cairo.Region.rectangle ({

0 commit comments

Comments
 (0)