Skip to content

Commit b31cbe1

Browse files
committed
Fix maximized window drag from panel on g-s 50
1 parent 09236d6 commit b31cbe1

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

src/panel.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ export const Panel = GObject.registerClass(
212212
Main.panel._tryDragWindow ||
213213
Main.panel._clickGesture
214214
) {
215-
if (Main.panel._clickGesture)
216-
Main.panel._clickGesture.set_enabled(false)
217-
218215
this._signalsHandler.add([
219216
this.panel,
220217
['button-press-event', 'touch-event'],
@@ -1270,10 +1267,20 @@ export const Panel = GObject.registerClass(
12701267

12711268
if (!dragWindow) return Clutter.EVENT_PROPAGATE
12721269

1270+
let dragOpArgs = [Meta.GrabOp.MOVING]
1271+
1272+
if (Config.PACKAGE_VERSION < '50')
1273+
dragOpArgs.push(event.get_device(), event.get_event_sequence())
1274+
else
1275+
dragOpArgs.push(
1276+
global.stage
1277+
.get_context()
1278+
.get_backend()
1279+
.get_sprite(global.stage, event),
1280+
)
1281+
12731282
dragWindow.begin_grab_op(
1274-
Meta.GrabOp.MOVING,
1275-
event.get_device(),
1276-
event.get_event_sequence(),
1283+
...dragOpArgs,
12771284
event.get_time(),
12781285
new Graphene.Point({ x: stageX, y: stageY }),
12791286
)

src/panelManager.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ export const PanelManager = class {
194194
)
195195
}
196196

197+
if (Main.panel._clickGesture) Main.panel._clickGesture.set_enabled(false)
198+
197199
LookingGlass.LookingGlass.prototype._oldResize =
198200
LookingGlass.LookingGlass.prototype._resize
199201
LookingGlass.LookingGlass.prototype._resize = _newLookingGlassResize
@@ -403,6 +405,8 @@ export const PanelManager = class {
403405
Main.overview._overview._controls._workspacesDisplay.setPrimaryWorkspaceVisible =
404406
this._oldSetPrimaryWorkspaceVisible
405407

408+
if (Main.panel._clickGesture) Main.panel._clickGesture.set_enabled(true)
409+
406410
LookingGlass.LookingGlass.prototype._resize =
407411
LookingGlass.LookingGlass.prototype._oldResize
408412
delete LookingGlass.LookingGlass.prototype._oldResize

0 commit comments

Comments
 (0)