
Using the ceiled radius for calculating the rightmost position the handle can take on the slider was resulting in a small gap when the size was not an integer value since the radius used when drawing the handle is not ceiled. This effectively reverts 38da479e which seems to have been the wrong fix for the problem it was trying to solve. The problem presumably had been caused by not considering the border that the handle still had at that time. The border issue was then later fixed by 3ddae9d8, without reverting 38da479e. Then in 6fd0aac8 support for drawing borders on the slider got dropped, including the changes from 3ddae9d8, leaving us with just the changes from 38da479e but now without borders on the handle. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8187 Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3648>
228 lines
6.6 KiB
JavaScript
228 lines
6.6 KiB
JavaScript
import Atk from 'gi://Atk';
|
|
import Clutter from 'gi://Clutter';
|
|
import GObject from 'gi://GObject';
|
|
|
|
import * as BarLevel from './barLevel.js';
|
|
|
|
const SLIDER_SCROLL_STEP = 0.02; /* Slider scrolling step in % */
|
|
|
|
export const Slider = GObject.registerClass({
|
|
Signals: {
|
|
'drag-begin': {},
|
|
'drag-end': {},
|
|
},
|
|
}, class Slider extends BarLevel.BarLevel {
|
|
_init(value) {
|
|
super._init({
|
|
value,
|
|
style_class: 'slider',
|
|
can_focus: true,
|
|
reactive: true,
|
|
track_hover: true,
|
|
hover: false,
|
|
accessible_role: Atk.Role.SLIDER,
|
|
x_expand: true,
|
|
});
|
|
|
|
this._releaseId = 0;
|
|
this._dragging = false;
|
|
|
|
this._handleRadius = 0;
|
|
|
|
this._customAccessible.connect('get-minimum-increment', this._getMinimumIncrement.bind(this));
|
|
}
|
|
|
|
vfunc_style_changed() {
|
|
super.vfunc_style_changed();
|
|
|
|
const themeNode = this.get_theme_node();
|
|
this._handleRadius = themeNode.get_length('-slider-handle-radius');
|
|
}
|
|
|
|
vfunc_repaint() {
|
|
super.vfunc_repaint();
|
|
|
|
// Add handle
|
|
let cr = this.get_context();
|
|
let themeNode = this.get_theme_node();
|
|
let [width, height] = this.get_surface_size();
|
|
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
|
|
|
|
const handleY = height / 2;
|
|
|
|
let handleX = this._handleRadius +
|
|
(width - 2 * this._handleRadius) * this._value / this._maxValue;
|
|
if (rtl)
|
|
handleX = width - handleX;
|
|
|
|
let color = themeNode.get_foreground_color();
|
|
cr.setSourceColor(color);
|
|
cr.arc(handleX, handleY, this._handleRadius, 0, 2 * Math.PI);
|
|
cr.fillPreserve();
|
|
cr.$dispose();
|
|
}
|
|
|
|
_getPreferredHeight() {
|
|
const barHeight = super._getPreferredHeight();
|
|
const handleHeight = 2 * this._handleRadius;
|
|
return Math.max(barHeight, handleHeight);
|
|
}
|
|
|
|
_getPreferredWidth() {
|
|
const barWidth = super._getPreferredWidth();
|
|
const handleWidth = 2 * this._handleRadius;
|
|
return Math.max(barWidth, handleWidth);
|
|
}
|
|
|
|
vfunc_button_press_event(event) {
|
|
return this.startDragging(event);
|
|
}
|
|
|
|
startDragging(event) {
|
|
if (this._dragging)
|
|
return Clutter.EVENT_PROPAGATE;
|
|
|
|
this._dragging = true;
|
|
|
|
let device = event.get_device();
|
|
let sequence = event.get_event_sequence();
|
|
|
|
this._grab = global.stage.grab(this);
|
|
|
|
this._grabbedDevice = device;
|
|
this._grabbedSequence = sequence;
|
|
|
|
// We need to emit 'drag-begin' before moving the handle to make
|
|
// sure that no 'notify::value' signal is emitted before this one.
|
|
this.emit('drag-begin');
|
|
|
|
let absX, absY;
|
|
[absX, absY] = event.get_coords();
|
|
this._moveHandle(absX, absY);
|
|
return Clutter.EVENT_STOP;
|
|
}
|
|
|
|
_endDragging() {
|
|
if (this._dragging) {
|
|
if (this._releaseId) {
|
|
this.disconnect(this._releaseId);
|
|
this._releaseId = 0;
|
|
}
|
|
|
|
if (this._grab) {
|
|
this._grab.dismiss();
|
|
this._grab = null;
|
|
}
|
|
|
|
this._grabbedSequence = null;
|
|
this._grabbedDevice = null;
|
|
this._dragging = false;
|
|
|
|
this.emit('drag-end');
|
|
}
|
|
return Clutter.EVENT_STOP;
|
|
}
|
|
|
|
vfunc_button_release_event() {
|
|
if (this._dragging && !this._grabbedSequence)
|
|
return this._endDragging();
|
|
|
|
return Clutter.EVENT_PROPAGATE;
|
|
}
|
|
|
|
vfunc_touch_event(event) {
|
|
let sequence = event.get_event_sequence();
|
|
|
|
if (!this._dragging &&
|
|
event.type() === Clutter.EventType.TOUCH_BEGIN) {
|
|
this.startDragging(event);
|
|
return Clutter.EVENT_STOP;
|
|
} else if (this._grabbedSequence &&
|
|
sequence.get_slot() === this._grabbedSequence.get_slot()) {
|
|
if (event.type() === Clutter.EventType.TOUCH_UPDATE)
|
|
return this._motionEvent(this, event);
|
|
else if (event.type() === Clutter.EventType.TOUCH_END)
|
|
return this._endDragging();
|
|
}
|
|
|
|
return Clutter.EVENT_PROPAGATE;
|
|
}
|
|
|
|
scroll(event) {
|
|
let direction = event.get_scroll_direction();
|
|
let delta = 0;
|
|
|
|
if (event.get_flags() & Clutter.EventFlags.FLAG_POINTER_EMULATED)
|
|
return Clutter.EVENT_PROPAGATE;
|
|
|
|
if (direction === Clutter.ScrollDirection.DOWN) {
|
|
delta = -SLIDER_SCROLL_STEP;
|
|
} else if (direction === Clutter.ScrollDirection.UP) {
|
|
delta = SLIDER_SCROLL_STEP;
|
|
} else if (direction === Clutter.ScrollDirection.SMOOTH) {
|
|
let [, dy] = event.get_scroll_delta();
|
|
// Even though the slider is horizontal, use dy to match
|
|
// the UP/DOWN above.
|
|
delta = -dy * SLIDER_SCROLL_STEP;
|
|
}
|
|
|
|
this.value = Math.min(Math.max(0, this._value + delta), this._maxValue);
|
|
|
|
return Clutter.EVENT_STOP;
|
|
}
|
|
|
|
vfunc_scroll_event(event) {
|
|
return this.scroll(event);
|
|
}
|
|
|
|
vfunc_motion_event(event) {
|
|
if (this._dragging && !this._grabbedSequence)
|
|
return this._motionEvent(this, event);
|
|
|
|
return Clutter.EVENT_PROPAGATE;
|
|
}
|
|
|
|
_motionEvent(actor, event) {
|
|
let absX, absY;
|
|
[absX, absY] = event.get_coords();
|
|
this._moveHandle(absX, absY);
|
|
return Clutter.EVENT_STOP;
|
|
}
|
|
|
|
vfunc_key_press_event(event) {
|
|
let key = event.get_key_symbol();
|
|
if (key === Clutter.KEY_Right || key === Clutter.KEY_Left) {
|
|
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
|
|
const increaseKey = rtl ? Clutter.KEY_Left : Clutter.KEY_Right;
|
|
const delta = key === increaseKey ? 0.1 : -0.1;
|
|
this.value = Math.max(0, Math.min(this._value + delta, this._maxValue));
|
|
return Clutter.EVENT_STOP;
|
|
}
|
|
return super.vfunc_key_press_event(event);
|
|
}
|
|
|
|
_moveHandle(absX, _absY) {
|
|
let relX, sliderX;
|
|
[sliderX] = this.get_transformed_position();
|
|
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
|
|
let width = this._barLevelWidth;
|
|
|
|
relX = absX - sliderX;
|
|
if (rtl)
|
|
relX = width - relX;
|
|
|
|
let newvalue;
|
|
if (relX < this._handleRadius)
|
|
newvalue = 0;
|
|
else if (relX > width - this._handleRadius)
|
|
newvalue = 1;
|
|
else
|
|
newvalue = (relX - this._handleRadius) / (width - 2 * this._handleRadius);
|
|
this.value = newvalue * this._maxValue;
|
|
}
|
|
|
|
_getMinimumIncrement() {
|
|
return 0.1;
|
|
}
|
|
});
|