Skip to content

WindowMenu: Fix move/resize actions #2896

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
lenemter merged 2 commits into from
Aug 12, 2026
Merged

WindowMenu: Fix move/resize actions #2896

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
5ce98bb
Handle grab op in WindowMenuManager
leolost2605 Aug 12, 2026
097ff00
Deprecate now unused actions
leolost2605 Aug 12, 2026
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
20 changes: 18 additions & 2 deletions src/Misc/WindowMenuManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,27 @@ public class Gala.WindowMenuManager : Object {
}

private void on_move (SimpleAction action, Variant? parameters) {
wm.perform_action (START_MOVE_CURRENT);
begin_grab_op (KEYBOARD_MOVING);
}

private void on_resize (SimpleAction action, Variant? parameters) {
wm.perform_action (START_RESIZE_CURRENT);
begin_grab_op (KEYBOARD_RESIZING_UNKNOWN);
}

private void begin_grab_op (Meta.GrabOp op) {
#if HAS_MUTTER49
var device = Clutter.get_default_backend ().get_pointer_sprite (wm.stage);
#else
var device = Clutter.get_default_backend ().get_default_seat ().get_pointer ();
#endif

current_window.begin_grab_op (
op, device,
#if !HAS_MUTTER49
null,
#endif
wm.get_display ().get_current_time (), null
);
}

private void on_maximize (SimpleAction action, Variant? parameters) {
Expand Down
35 changes: 2 additions & 33 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,35 +605,6 @@ namespace Gala {
});
}

private void set_grab_trigger (Meta.Window window, Meta.GrabOp op) {
var proxy = push_modal (stage, true);

ulong handler = 0;
handler = stage.captured_event.connect ((event) => {
if (event.get_type () == MOTION || event.get_type () == ENTER ||
event.get_type () == TOUCHPAD_HOLD || event.get_type () == TOUCH_BEGIN) {
window.begin_grab_op (
op,
null,
#if !HAS_MUTTER49
event.get_event_sequence (),
#endif
event.get_time ()
, null
);
} else if (event.get_type () == LEAVE) {
/* We get leave emitted when beginning a grab op, so we have
to filter it in order to avoid disconnecting and popping twice */
return Clutter.EVENT_PROPAGATE;
}

pop_modal (proxy);
stage.disconnect (handler);

return Clutter.EVENT_PROPAGATE;
});
}

/**
* {@inheritDoc}
*/
Expand Down Expand Up @@ -672,12 +643,10 @@ namespace Gala {
current.minimize ();
break;
case ActionType.START_MOVE_CURRENT:
if (current != null && current.allows_move ())
set_grab_trigger (current, KEYBOARD_MOVING);
warning ("Action START_MOVE_CURRENT is deprecated");
break;
case ActionType.START_RESIZE_CURRENT:
if (current != null && current.allows_resize ())
set_grab_trigger (current, KEYBOARD_RESIZING_UNKNOWN);
warning ("Action START_RESIZE_CURRENT is deprecated");
break;
case ActionType.TOGGLE_ALWAYS_ON_TOP_CURRENT:
if (current == null)
Expand Down