Skip to content
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

Jump to bottom

Dnd.js: Revert bug workaround #12298

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Dnd.js: Revert bug workaround #12298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 0 additions & 6 deletions js/ui/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ const Signals = imports.signals;
const Gettext = imports.gettext;
const Cinnamon = imports.gi.Cinnamon;
const SignalManager = imports.misc.signalManager;
const Dnd = imports.ui.dnd;

var AllowedLayout = { // the panel layout that an applet is suitable for
VERTICAL: 'vertical',
Expand Down Expand Up @@ -1059,11 +1058,6 @@ var PopupResizeHandler = class PopupResizeHandler {
return false;

//---Start drag------

if (Dnd.currentGrabActor != null) { //workaround for issue github.com/linuxmint/cinnamon/issues/11123
Dnd.currentGrabActor.fakeRelease();
}

this._grabEvents(event);
this.resizingInProgress = true;

Expand Down
4 changes: 0 additions & 4 deletions js/ui/dnd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ var currentDraggable = null;
var dragMonitors = [];
var targetMonitors = [];

var currentGrabActor = null; //This is used by class PopupResizeHandler in ui/applet.js as a workaround to issue github.com/linuxmint/cinnamon/issues/11123

function _getEventHandlerActor() {
if (!eventHandlerActor) {
eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
Expand Down Expand Up @@ -156,7 +154,6 @@ var _Draggable = new Lang.Class({
this.drag_device.grab(this.actor);
this._onEventId = this.actor.connect('event',
Lang.bind(this, this._onEvent));
currentGrabActor = this;
},

_ungrabActor: function(event) {
Expand All @@ -171,7 +168,6 @@ var _Draggable = new Lang.Class({

this.actor.disconnect(this._onEventId);
this._onEventId = null;
currentGrabActor = null;
},

_grabEvents: function(event) {
Expand Down
Loading