Skip to content

Commit

Permalink
Dns.js: Revert bug workaround (linuxmint#12298)
Browse files Browse the repository at this point in the history
Revert a workaround added in commit linuxmint@c5af58b that prevented a dnd bug linuxmint#11665 (comment)

The original bug linuxmint#11123 has now been fixed so this workaround is no longer needed.
  • Loading branch information
fredcw authored Jul 20, 2024
1 parent e675818 commit 80cbf6a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
6 changes: 0 additions & 6 deletions js/ui/applet.js
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
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

0 comments on commit 80cbf6a

Please sign in to comment.