Skip to content

DragDropAction: properly handle button release event #2104

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 4 commits into from
Nov 2, 2024
Merged

DragDropAction: properly handle button release event #2104

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef82d81
DragDropAction: properly handle button release event
lenemter Nov 1, 2024
d03cd1b
Fix lint
lenemter Nov 1, 2024
8ebe29b
Merge branch 'main' into lenemter/fix-drag
lenemter Nov 1, 2024
7d8e732
Merge branch 'main' into lenemter/fix-drag
lenemter Nov 2, 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
76 changes: 39 additions & 37 deletions lib/DragDropAction.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,40 +216,6 @@ namespace Gala {

return Clutter.EVENT_STOP;

case EventType.BUTTON_RELEASE:
case EventType.TOUCH_END:
if (!is_valid_touch_event (event)) {
return Clutter.EVENT_PROPAGATE;
}

if (!dragging) {
float x, y, ex, ey;
event.get_coords (out ex, out ey);
actor.get_transformed_position (out x, out y);

// release has happened within bounds of actor
if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
}

if (clicked) {
ungrab_actor ();
clicked = false;
}

return Clutter.EVENT_STOP;
} else if (dragging) {
if (hovered != null) {
finish ();
hovered = null;
} else {
cancel ();
}

return Clutter.EVENT_STOP;
}
break;

default:
break;
}
Expand Down Expand Up @@ -298,7 +264,42 @@ namespace Gala {
if (event.get_key_symbol () == Key.Escape) {
cancel ();
}
break;

return Clutter.EVENT_STOP;

case EventType.BUTTON_RELEASE:
case EventType.TOUCH_END:
if (!is_valid_touch_event (event)) {
return Clutter.EVENT_PROPAGATE;
}

if (dragging) {
if (hovered != null) {
finish ();
hovered = null;
} else {
cancel ();
}

return Clutter.EVENT_STOP;
}

float x, y, ex, ey;
event.get_coords (out ex, out ey);
actor.get_transformed_position (out x, out y);

// release has happened within bounds of actor
if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
}

if (clicked) {
ungrab_actor ();
clicked = false;
}

return Clutter.EVENT_STOP;

case EventType.MOTION:
case EventType.TOUCH_UPDATE:
if (!is_valid_touch_event (event)) {
Expand Down Expand Up @@ -338,6 +339,7 @@ namespace Gala {
}
}
return Clutter.EVENT_STOP;

} else if (dragging) {
handle.x -= last_x - x;
handle.y -= last_y - y;
Expand Down Expand Up @@ -468,11 +470,11 @@ namespace Gala {
var type = event.get_type ();

return (
Meta.Util.is_wayland_compositor () ||
type != Clutter.EventType.TOUCH_BEGIN &&
type != Clutter.EventType.TOUCH_CANCEL &&
type != Clutter.EventType.TOUCH_END &&
type != Clutter.EventType.TOUCH_UPDATE ||
Meta.Util.is_wayland_compositor ()
type != Clutter.EventType.TOUCH_UPDATE
);
}
}
Expand Down