elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-24 17:53:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

DragDropAction: Activate click signal on release (#1560)

Browse Source
This commit is contained in:
Leo 2023-02-22 14:24:01 +09:00 committed by GitHub
parent b3e5d7af28
commit 3c98ecac06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/DragDropAction.vala
View File

@ -187,18 +187,13 @@ namespace Gala {
public override bool handle_event (Event event) {
if (!(DragDropActionType.SOURCE in drag_type)) {
return false;
return Gdk.EVENT_PROPAGATE;
}
switch (event.get_type ()) {
case EventType.BUTTON_PRESS:
if (event.get_button () != 1) {
actor_clicked (event.get_button ());
return false;
}
if (grabbed_actor != null) {
return false;
return Gdk.EVENT_PROPAGATE;
}
grab_actor (actor, event.get_device ());
@ -210,7 +205,7 @@ namespace Gala {
last_x = x;
last_y = y;
return true;
return Gdk.EVENT_STOP;
case EventType.BUTTON_RELEASE:
if (!dragging) {
@ -226,7 +221,7 @@ namespace Gala {
ungrab_actor ();
clicked = false;
dragging = false;
return true;
return Gdk.EVENT_STOP;
} else if (dragging) {
if (hovered != null) {
finish ();
@ -234,7 +229,7 @@ namespace Gala {
cancel ();
}
return true;
return Gdk.EVENT_STOP;
}
break;
@ -278,7 +273,7 @@ namespace Gala {
if (grabbed_device != null &&
device != grabbed_device &&
device.get_device_type () != InputDeviceType.KEYBOARD_DEVICE) {
return false;
return Gdk.EVENT_PROPAGATE;
}
switch (event.get_type ()) {
@ -298,7 +293,7 @@ namespace Gala {
if (handle == null) {
ungrab_actor ();
critical ("No handle has been returned by the started signal, aborting drag.");
return false;
return Gdk.EVENT_PROPAGATE;
}
clicked = false;
@ -322,7 +317,7 @@ namespace Gala {
}
}
}
return true;
return Gdk.EVENT_STOP;
} else if (dragging) {
handle.x -= last_x - x;
handle.y -= last_y - y;
@ -342,7 +337,7 @@ namespace Gala {
// didn't change, no need to do anything
if (actor == hovered)
return true;
return Gdk.EVENT_STOP;
if (action == null) {
// apparently we left ours if we had one before
@ -351,7 +346,7 @@ namespace Gala {
hovered = null;
}
return true;
return Gdk.EVENT_STOP;
}
// signal the previous one that we left it
@ -363,7 +358,7 @@ namespace Gala {
hovered = actor;
emit_crossed (hovered, true);
return true;
return Gdk.EVENT_STOP;
}
break;
@ -371,7 +366,7 @@ namespace Gala {
break;
}
return false;
return Gdk.EVENT_PROPAGATE;
}
/**

4
src/Widgets/WorkspaceClone.vala
View File

@ -172,9 +172,9 @@ namespace Gala {
background = new FramedBackground (display);
background.reactive = true;
background.button_press_event.connect (() => {
background.button_release_event.connect (() => {
selected (true);
return false;
return Gdk.EVENT_PROPAGATE;
});
window_container = new WindowCloneContainer (wm, gesture_tracker);