brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Use gjs-defined GObject accessors where possible

Browse Source 
Nowadays gjs allows to omit get/set accessors for read-write properties,
and will define reasonable defaults in that case. In many cases we don't
need anything more than the default handling, let gjs handle those props.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1611>
This commit is contained in:
Florian Müllner
2021-01-30 01:03:04 +01:00
parent a41e294e21
commit 0f1b566918
5 changed files with 68 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
js/ui/swipeTracker.js
View File

@ -53,37 +53,11 @@ const TouchpadSwipeGesture = GObject.registerClass({
this._touchpadSettings = new Gio.Settings({
schema_id: 'org.gnome.desktop.peripherals.touchpad',
});
this._orientation = Clutter.Orientation.VERTICAL;
this._enabled = true;
this._stageCaptureEvent =
global.stage.connect('captured-event::touchpad', this._handleEvent.bind(this));
}
get enabled() {
return this._enabled;
}
set enabled(enabled) {
if (this._enabled === enabled)
return;
this._enabled = enabled;
this.notify('enabled');
}
get orientation() {
return this._orientation;
}
set orientation(orientation) {
if (this._orientation === orientation)
return;
this._orientation = orientation;
this.notify('orientation');
}
_handleEvent(actor, event) {
if (event.type() !== Clutter.EventType.TOUCHPAD_SWIPE)
return Clutter.EVENT_PROPAGATE;
@ -103,7 +77,7 @@ const TouchpadSwipeGesture = GObject.registerClass({
let [dx, dy] = event.get_gesture_motion_delta();
let delta;
if (this._orientation === Clutter.Orientation.VERTICAL)
if (this.orientation === Clutter.Orientation.VERTICAL)
delta = dy / TOUCHPAD_BASE_HEIGHT;
else
delta = dx / TOUCHPAD_BASE_WIDTH;
@ -162,7 +136,6 @@ const TouchSwipeGesture = GObject.registerClass({
this._allowedModes = allowedModes;
this._distance = global.screen_height;
this._orientation = Clutter.Orientation.VERTICAL;
global.display.connect('grab-op-begin', () => {
this.cancel();
@ -183,18 +156,6 @@ const TouchSwipeGesture = GObject.registerClass({
this.notify('distance');
}
get orientation() {
return this._orientation;
}
set orientation(orientation) {
if (this._orientation === orientation)
return;
this._orientation = orientation;
this.notify('orientation');
}
vfunc_gesture_prepare(actor) {
if (!super.vfunc_gesture_prepare(actor))
return false;
@ -207,7 +168,7 @@ const TouchSwipeGesture = GObject.registerClass({
let [x, y] = this.get_motion_coords(0);
this._lastPosition =
this._orientation === Clutter.Orientation.VERTICAL ? y : x;
this.orientation === Clutter.Orientation.VERTICAL ? y : x;
this.emit('begin', time, xPress, yPress);
return true;
@ -215,7 +176,7 @@ const TouchSwipeGesture = GObject.registerClass({
vfunc_gesture_progress(_actor) {
let [x, y] = this.get_motion_coords(0);
let pos = this._orientation === Clutter.Orientation.VERTICAL ? y : x;
let pos = this.orientation === Clutter.Orientation.VERTICAL ? y : x;
let delta = pos - this._lastPosition;
this._lastPosition = pos;
@ -262,7 +223,6 @@ const ScrollGesture = GObject.registerClass({
this._allowedModes = allowedModes;
this._began = false;
this._enabled = true;
this._orientation = Clutter.Orientation.VERTICAL;
actor.connect('scroll-event', this._handleEvent.bind(this));
}
@ -281,18 +241,6 @@ const ScrollGesture = GObject.registerClass({
this.notify('enabled');
}
get orientation() {
return this._orientation;
}
set orientation(orientation) {
if (this._orientation === orientation)
return;
this._orientation = orientation;
this.notify('orientation');
}
canHandleEvent(event) {
if (event.type() !== Clutter.EventType.SCROLL)
return false;
@ -332,7 +280,7 @@ const ScrollGesture = GObject.registerClass({
}
let delta;
if (this._orientation === Clutter.Orientation.VERTICAL)
if (this.orientation === Clutter.Orientation.VERTICAL)
delta = dy / TOUCHPAD_BASE_HEIGHT;
else
delta = dx / TOUCHPAD_BASE_WIDTH;
@ -401,7 +349,6 @@ var SwipeTracker = GObject.registerClass({
this._allowedModes = allowedModes;
this._enabled = true;
this._orientation = Clutter.Orientation.VERTICAL;
this._distance = global.screen_height;
this._reset();
@ -481,18 +428,6 @@ var SwipeTracker = GObject.registerClass({
this.notify('enabled');
}
get orientation() {
return this._orientation;
}
set orientation(orientation) {
if (this._orientation === orientation)
return;
this._orientation = orientation;
this.notify('orientation');
}
get distance() {
return this._distance;
}