isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dnd: Remove buttonDown private property

Browse Source 
This was introduced with commit
6cae94edcc, it doesn't seem to make sense
anymore these days.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2318>
This commit is contained in:
Jonas Dreßler 2022-03-17 21:27:28 +01:00 committed by Marge Bot
parent de08ec915f
commit abc43530bc
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/dnd.js
View File

@ -115,7 +115,6 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
this._dragActorOpacity = params.dragActorOpacity; this._dragActorOpacity = params.dragActorOpacity;
this._dragTimeoutThreshold = params.timeoutThreshold; this._dragTimeoutThreshold = params.timeoutThreshold;
this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting). this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
this._dragCancellable = true; this._dragCancellable = true;
} }
@ -124,7 +123,6 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
if (event.get_button() != 1) if (event.get_button() != 1)
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
this._buttonDown = true;
this._grabActor(event.get_device()); this._grabActor(event.get_device());
let [stageX, stageY] = event.get_coords(); let [stageX, stageY] = event.get_coords();
@ -151,7 +149,6 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
!global.display.is_pointer_emulating_sequence(event.get_event_sequence())) !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
return Clutter.EVENT_PROPAGATE; return Clutter.EVENT_PROPAGATE;
this._buttonDown = true;
this._grabActor(event.get_device(), event.get_event_sequence()); this._grabActor(event.get_device(), event.get_event_sequence());
this._dragStartTime = event.get_time(); this._dragStartTime = event.get_time();
this._dragThresholdIgnored = false; this._dragThresholdIgnored = false;
@ -243,7 +240,6 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
// to complete the drag and ensure that whatever happens to be under the pointer does // to complete the drag and ensure that whatever happens to be under the pointer does
// not get triggered if the drag was cancelled with Esc. // not get triggered if the drag was cancelled with Esc.
if (this._eventIsRelease(event)) { if (this._eventIsRelease(event)) {
this._buttonDown = false;
if (this._dragState == DragState.DRAGGING) { if (this._dragState == DragState.DRAGGING) {
return this._dragActorDropped(event); return this._dragActorDropped(event);
} else if ((this._dragActor != null || this._dragState == DragState.CANCELLED) && } else if ((this._dragActor != null || this._dragState == DragState.CANCELLED) &&
@ -288,7 +284,6 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
* PopupMenu.ignoreRelease()) * PopupMenu.ignoreRelease())
*/ */
fakeRelease() { fakeRelease() {
this._buttonDown = false;
this._ungrabActor(); this._ungrabActor();
} }
@ -703,8 +698,7 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
if (this._actorDestroyed || wasCancelled) { if (this._actorDestroyed || wasCancelled) {
global.display.set_cursor(Meta.Cursor.DEFAULT); global.display.set_cursor(Meta.Cursor.DEFAULT);
if (!this._buttonDown) this._dragComplete();
this._dragComplete();
this.emit('drag-end', eventTime, false); this.emit('drag-end', eventTime, false);
if (!this._dragOrigParent && this._dragActor) if (!this._dragOrigParent && this._dragActor)
this._dragActor.destroy(); this._dragActor.destroy();
@ -755,8 +749,7 @@ var _Draggable = class _Draggable extends Signals.EventEmitter {
return; return;
this._animationInProgress = false; this._animationInProgress = false;
if (!this._buttonDown) this._dragComplete();
this._dragComplete();
global.display.set_cursor(Meta.Cursor.DEFAULT); global.display.set_cursor(Meta.Cursor.DEFAULT);
} }