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

slider: Cache slider width for dragging handlers

Browse Source 
The actor allocation will be invalid on CLUTTER_TOUCH_BEGIN, because
it comes together with a CLUTTER_ENTER event that will recalculate
styles, and queue a relayout in result.

The net result is that on CLUTTER_TOUCH_BEGIN, the relayout has been
already queued, so the slider width comes up as 0, and the value ends
up as 1. Later touch events already happen on a validated actor, so
it is corrected. Still, not fun when modifying the volume slider on a
touchscreen.
This commit is contained in:
Carlos Garnacho 2017-07-15 01:24:40 +02:00
parent 330a28742f
commit 516d19eb39
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/slider.js
View File

@ -17,6 +17,7 @@ const Slider = new Lang.Class({
// Avoid spreading NaNs around // Avoid spreading NaNs around
throw TypeError('The slider value must be a number'); throw TypeError('The slider value must be a number');
this._value = Math.max(Math.min(value, 1), 0); this._value = Math.max(Math.min(value, 1), 0);
this._sliderWidth = 0;
this.actor = new St.DrawingArea({ style_class: 'slider', this.actor = new St.DrawingArea({ style_class: 'slider',
can_focus: true, can_focus: true,
@ -27,6 +28,9 @@ const Slider = new Lang.Class({
this.actor.connect('touch-event', Lang.bind(this, this._touchDragging)); this.actor.connect('touch-event', Lang.bind(this, this._touchDragging));
this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
this.actor.connect('key-press-event', Lang.bind(this, this.onKeyPressEvent)); this.actor.connect('key-press-event', Lang.bind(this, this.onKeyPressEvent));
this.actor.connect('allocation-changed', (actor, box) => {
this._sliderWidth = box.get_width();
});
this._releaseId = this._motionId = 0; this._releaseId = this._motionId = 0;
this._dragging = false; this._dragging = false;
@ -242,7 +246,7 @@ const Slider = new Lang.Class({
relX = absX - sliderX; relX = absX - sliderX;
relY = absY - sliderY; relY = absY - sliderY;
let width = this.actor.width; let width = this._sliderWidth;
let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius'); let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius');
let newvalue; let newvalue;