Updating 44/vertical-workspaces to version 37+20231208 [0d82192].
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
975b88c6bb
commit
07381ac119
37 changed files with 9559 additions and 4338 deletions
|
@ -10,61 +10,90 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
const { Clutter, GObject } = imports.gi;
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const GObject = imports.gi.GObject;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
const SwipeTracker = imports.ui.swipeTracker;
|
||||
|
||||
const Me = imports.misc.extensionUtils.getCurrentExtension();
|
||||
|
||||
let Me;
|
||||
let opt;
|
||||
let _firstRun = true;
|
||||
|
||||
let _vwGestureUpdateId;
|
||||
let _originalGestureUpdateId;
|
||||
var SwipeTrackerModule = class {
|
||||
constructor(me) {
|
||||
Me = me;
|
||||
opt = Me.opt;
|
||||
|
||||
function update(reset = false) {
|
||||
opt = Me.imports.lib.settings.opt;
|
||||
const moduleEnabled = opt.get('swipeTrackerModule', true);
|
||||
reset = reset || !moduleEnabled;
|
||||
|
||||
// don't even touch this module if disabled
|
||||
if (_firstRun && reset)
|
||||
return;
|
||||
|
||||
_firstRun = false;
|
||||
|
||||
if (reset || !opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL
|
||||
// original swipeTrackers' orientation and updateGesture function
|
||||
Main.overview._swipeTracker.orientation = Clutter.Orientation.VERTICAL;
|
||||
Main.wm._workspaceAnimation._swipeTracker.orientation = Clutter.Orientation.HORIZONTAL;
|
||||
Main.overview._swipeTracker._updateGesture = SwipeTracker.SwipeTracker.prototype._updateGesture;
|
||||
if (_vwGestureUpdateId) {
|
||||
Main.overview._swipeTracker._touchpadGesture.disconnect(_vwGestureUpdateId);
|
||||
_vwGestureUpdateId = 0;
|
||||
}
|
||||
if (_originalGestureUpdateId) {
|
||||
Main.overview._swipeTracker._touchpadGesture.unblock_signal_handler(_originalGestureUpdateId);
|
||||
_originalGestureUpdateId = 0;
|
||||
}
|
||||
|
||||
opt = null;
|
||||
return;
|
||||
this._firstActivation = true;
|
||||
this.moduleEnabled = false;
|
||||
}
|
||||
|
||||
if (opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL
|
||||
cleanGlobals() {
|
||||
Me = null;
|
||||
opt = null;
|
||||
}
|
||||
|
||||
update(reset) {
|
||||
this.moduleEnabled = opt.get('swipeTrackerModule');
|
||||
const conflict = false;
|
||||
|
||||
reset = reset || !this.moduleEnabled || conflict;
|
||||
|
||||
// don't touch the original code if module disabled
|
||||
if (reset && !this._firstActivation) {
|
||||
this._disableModule();
|
||||
} else if (!reset) {
|
||||
this._firstActivation = false;
|
||||
this._activateModule();
|
||||
}
|
||||
if (reset && this._firstActivation)
|
||||
console.debug(' SwipeTrackerModule - Keeping untouched');
|
||||
}
|
||||
|
||||
_activateModule() {
|
||||
if (opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL
|
||||
this._setVertical();
|
||||
} else {
|
||||
this._setHorizontal();
|
||||
}
|
||||
console.debug(' SwipeTrackerModule - Activated');
|
||||
}
|
||||
|
||||
_disableModule() {
|
||||
this._setHorizontal();
|
||||
|
||||
console.debug(' SwipeTrackerModule - Disabled');
|
||||
}
|
||||
|
||||
_setVertical() {
|
||||
// reverse swipe gestures for enter/leave overview and ws switching
|
||||
Main.overview._swipeTracker.orientation = Clutter.Orientation.HORIZONTAL;
|
||||
Main.wm._workspaceAnimation._swipeTracker.orientation = Clutter.Orientation.VERTICAL;
|
||||
// overview's updateGesture() function should reflect ws tmb position to match appGrid/ws animation direction
|
||||
// function in connection cannot be overridden in prototype of its class because connected is actually another copy of the original function
|
||||
if (!_originalGestureUpdateId) {
|
||||
_originalGestureUpdateId = GObject.signal_handler_find(Main.overview._swipeTracker._touchpadGesture, { signalId: 'update' });
|
||||
Main.overview._swipeTracker._touchpadGesture.block_signal_handler(_originalGestureUpdateId);
|
||||
if (!this._originalGestureUpdateId) {
|
||||
this._originalGestureUpdateId = GObject.signal_handler_find(Main.overview._swipeTracker._touchpadGesture, { signalId: 'update' });
|
||||
Main.overview._swipeTracker._touchpadGesture.block_signal_handler(this._originalGestureUpdateId);
|
||||
Main.overview._swipeTracker._updateGesture = SwipeTrackerVertical._updateGesture;
|
||||
_vwGestureUpdateId = Main.overview._swipeTracker._touchpadGesture.connect('update', SwipeTrackerVertical._updateGesture.bind(Main.overview._swipeTracker));
|
||||
this._vwGestureUpdateId = Main.overview._swipeTracker._touchpadGesture.connect('update', SwipeTrackerVertical._updateGesture.bind(Main.overview._swipeTracker));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_setHorizontal() {
|
||||
// original swipeTrackers' orientation and updateGesture function
|
||||
Main.overview._swipeTracker.orientation = Clutter.Orientation.VERTICAL;
|
||||
Main.wm._workspaceAnimation._swipeTracker.orientation = Clutter.Orientation.HORIZONTAL;
|
||||
Main.overview._swipeTracker._updateGesture = SwipeTracker.SwipeTracker.prototype._updateGesture;
|
||||
if (this._vwGestureUpdateId) {
|
||||
Main.overview._swipeTracker._touchpadGesture.disconnect(this._vwGestureUpdateId);
|
||||
this._vwGestureUpdateId = 0;
|
||||
}
|
||||
if (this._originalGestureUpdateId) {
|
||||
Main.overview._swipeTracker._touchpadGesture.unblock_signal_handler(this._originalGestureUpdateId);
|
||||
this._originalGestureUpdateId = 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const SwipeTrackerVertical = {
|
||||
_updateGesture(gesture, time, delta, distance) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue