From e1a0e508c7adbe8da950233c5b8cc680a1ab5df5 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Mon, 4 Apr 2022 21:29:23 -0400 Subject: [PATCH] Adjust overview click on empty space --- overview.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/overview.js b/overview.js index 6effdfc..4c34791 100644 --- a/overview.js +++ b/overview.js @@ -33,7 +33,7 @@ const Gdk = imports.gi.Gdk; const Gio = imports.gi.Gio; const Mainloop = imports.mainloop; const IconGrid = imports.ui.iconGrid; -const OverviewControls = imports.ui.overviewControls; +const { OverviewActor } = imports.ui.overview; const Workspace = imports.ui.workspace; const St = imports.gi.St; const WorkspaceThumbnail = imports.ui.workspaceThumbnail; @@ -429,20 +429,17 @@ var Overview = class { return; this._oldOverviewReactive = Main.overview._overview.reactive - Main.overview._overview.reactive = true; - this._clickAction = new Clutter.ClickAction(); - this._clickAction.connect('clicked', () => { - - if (this._swiping) - return Clutter.EVENT_PROPAGATE; - + Utils.hookVfunc(Object.getPrototypeOf(Main.overview._overview), 'button_release_event', () => { let [x, y] = global.get_pointer(); + let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y); - Main.overview.toggle(); - }); - Main.overview._overview.add_action(this._clickAction); + if (pickedActor && pickedActor.has_style_class_name('apps-scroll-view')) + return Clutter.EVENT_PROPAGATE; + + Main.overview.toggle() + }) this._clickToExitEnabled = true; } @@ -451,11 +448,9 @@ var Overview = class { if (!this._clickToExitEnabled) return; - Main.overview._overview.remove_action(this._clickAction); Main.overview._overview.reactive = this._oldOverviewReactive; + Utils.hookVfunc(Object.getPrototypeOf(Main.overview._overview), 'button_release_event', null) - this._signalsHandler.removeWithLabel('clickToExit'); - this._clickToExitEnabled = false; }