morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix workspace navigation when dragging overview

Browse Source
This commit is contained in:
l3nn4rt
2020-08-16 23:18:11 +02:00
parent c793632b56
commit b8a2bea914
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
overview.js
View File

@@ -428,7 +428,7 @@ var dtpOverview = Utils.defineClass({
this._clickAction = new Clutter.ClickAction();
this._clickAction.connect('clicked', () => {
if(this._appPageSwiping)
if (this._swiping)
return Clutter.EVENT_PROPAGATE;
let [x, y] = global.get_pointer();
@@ -478,30 +478,33 @@ var dtpOverview = Utils.defineClass({
});
Main.overview._overview.add_action(this._clickAction);
Main.overview.viewSelector.appDisplay._views.forEach((v) => {
if(v.view._swipeTracker) {
[
Main.overview.viewSelector._workspacesDisplay,
Main.overview.viewSelector.appDisplay._views[1].view
].forEach(v => {
if (v._swipeTracker) {
this._signalsHandler.addWithLabel('clickToExit', [
v.view._swipeTracker,
v._swipeTracker,
'begin',
Lang.bind(this, this._onAppPageSwipeBegin)
Lang.bind(this, this._onSwipeBegin)
],[
v.view._swipeTracker,
v._swipeTracker,
'end',
Lang.bind(this, this._onAppPageSwipeEnd)
Lang.bind(this, this._onSwipeEnd)
]);
} else if(v.view._panAction) {
} else if (v._panAction) {
this._signalsHandler.addWithLabel('clickToExit', [
v.view._panAction,
v._panAction,
'gesture-begin',
Lang.bind(this, this._onAppPageSwipeBegin)
Lang.bind(this, this._onSwipeBegin)
],[
v.view._panAction,
v._panAction,
'gesture-cancel',
Lang.bind(this, this._onAppPageSwipeEnd)
Lang.bind(this, this._onSwipeEnd)
],[
v.view._panAction,
v._panAction,
'gesture-end',
Lang.bind(this, this._onAppPageSwipeEnd)
Lang.bind(this, this._onSwipeEnd)
]);
}
});
@@ -510,7 +513,7 @@ var dtpOverview = Utils.defineClass({
},
_disableClickToExit: function () {
if(!this._clickToExitEnabled)
if (!this._clickToExitEnabled)
return;
Main.overview._overview.remove_action(this._clickAction);
@@ -521,16 +524,16 @@ var dtpOverview = Utils.defineClass({
this._clickToExitEnabled = false;
},
_onAppPageSwipeBegin: function() {
this._appPageSwiping = true;
_onSwipeBegin: function() {
this._swiping = true;
return true;
},
_onAppPageSwipeEnd: function() {
_onSwipeEnd: function() {
this._timeoutsHandler.add([
T1,
0,
() => this._appPageSwiping = false
() => this._swiping = false
]);
return true;
}