Skip to content

Fix for touch window drag-and-drop #736

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
jtaala merged 5 commits into from
Jan 28, 2024
Merged

Fix for touch window drag-and-drop #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b732874
Partial fix for touch window drag-and-drop
Thesola10 Dec 10, 2023
eec4b6d
Fixed coordinate retrieval in update function
Thesola10 Dec 10, 2023
042449e
Warp global pointer to follow touch event
Thesola10 Jan 28, 2024
cd97868
A little cleanup, applying linter recommendations, and improving and …
jtaala Jan 28, 2024
7335e55
Added quick comment
Thesola10 Jan 28, 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
13 changes: 13 additions & 0 deletions grab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ export class MoveGrab {
center && clone.set_pivot_point(0, 0);

this.signals.connect(this.actor, "button-release-event", this.end.bind(this));
this.signals.connect(this.actor, "touch-event", (act, evt) => {
if (evt.type() === Clutter.EventType.TOUCH_END) {
this.end();
}
else {
this.motion(act, evt);
}
});
this.signals.connect(this.actor, "motion-event", this.motion.bind(this));
this.signals.connect(global.display, "window-entered-monitor",
this.beginDnD.bind(this)
Expand Down Expand Up @@ -301,6 +309,11 @@ export class MoveGrab {
let metaWindow = this.window;
// let [gx, gy] = event.get_coords();
let [gx, gy, $] = global.get_pointer();
if (event.type() === Clutter.EventType.TOUCH_UPDATE) {
[gx, gy] = event.get_coords();
// We update global pointer to match touch event
Utils.warpPointer(gx, gy, false);
}
let [dx, dy] = this.pointerOffset;
let clone = metaWindow.clone;

Expand Down
10 changes: 6 additions & 4 deletions utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,12 +209,14 @@ export function warpPointerToMonitor(monitor, center = false) {

/**
* Warps pointer to x, y coordinates.
* Optionally shows a ripple effect after warp.
*/
export function warpPointer(x, y) {
let backend = Clutter.get_default_backend();
let seat = backend.get_default_seat();
export function warpPointer(x, y, ripple = true) {
const seat = Clutter.get_default_backend().get_default_seat();
seat.warp_pointer(x, y);
warpRipple.playAnimation(x, y);
if (ripple) {
warpRipple.playAnimation(x, y);
}
}

/**
Expand Down