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

slider: Cache custom style properties

Browse Source 
Custom properties are not cached by the theme node itself, so
looking them up repeatedly at every repaint is relatively
expensive.

Avoid this by caching the values ourselves at style changes.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2994>
This commit is contained in:
Florian Müllner 2023-10-26 20:09:23 +02:00 committed by Marge Bot
parent a639fb0fc4
commit a6706bd2ca
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/ui/slider.js
View File

@ -27,9 +27,25 @@ export const Slider = GObject.registerClass({
this._releaseId = 0; this._releaseId = 0;
this._dragging = false; this._dragging = false;
this._handleRadius = 0;
this._handleBorderWidth = 0;
this._handleBorderColor = null;
this._customAccessible.connect('get-minimum-increment', this._getMinimumIncrement.bind(this)); 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');
this._handleBorderWidth =
themeNode.get_length('-slider-handle-border-width');
const [hasHandleColor, handleBorderColor] =
themeNode.lookup_color('-slider-handle-border-color', false);
this._handleBorderColor = hasHandleColor ? handleBorderColor : null;
}
vfunc_repaint() { vfunc_repaint() {
super.vfunc_repaint(); super.vfunc_repaint();
@ -39,13 +55,7 @@ export const Slider = GObject.registerClass({
let [width, height] = this.get_surface_size(); let [width, height] = this.get_surface_size();
const rtl = this.get_text_direction() === Clutter.TextDirection.RTL; const rtl = this.get_text_direction() === Clutter.TextDirection.RTL;
let handleRadius = themeNode.get_length('-slider-handle-radius'); const ceiledHandleRadius = Math.ceil(this._handleRadius + this._handleBorderWidth);
let handleBorderWidth = themeNode.get_length('-slider-handle-border-width');
let [hasHandleColor, handleBorderColor] =
themeNode.lookup_color('-slider-handle-border-color', false);
const ceiledHandleRadius = Math.ceil(handleRadius + handleBorderWidth);
const handleY = height / 2; const handleY = height / 2;
let handleX = ceiledHandleRadius + let handleX = ceiledHandleRadius +
@ -55,11 +65,11 @@ export const Slider = GObject.registerClass({
let color = themeNode.get_foreground_color(); let color = themeNode.get_foreground_color();
cr.setSourceColor(color); cr.setSourceColor(color);
cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI); cr.arc(handleX, handleY, this._handleRadius, 0, 2 * Math.PI);
cr.fillPreserve(); cr.fillPreserve();
if (hasHandleColor && handleBorderWidth) { if (this._handleBorderColor && this._handleBorderWidth) {
cr.setSourceColor(handleBorderColor); cr.setSourceColor(this._handleBorderColor);
cr.setLineWidth(handleBorderWidth); cr.setLineWidth(this._handleBorderWidth);
cr.stroke(); cr.stroke();
} }
cr.$dispose(); cr.$dispose();
@ -200,15 +210,13 @@ export const Slider = GObject.registerClass({
if (rtl) if (rtl)
relX = width - relX; relX = width - relX;
let handleRadius = this.get_theme_node().get_length('-slider-handle-radius');
let newvalue; let newvalue;
if (relX < handleRadius) if (relX < this._handleRadius)
newvalue = 0; newvalue = 0;
else if (relX > width - handleRadius) else if (relX > width - this._handleRadius)
newvalue = 1; newvalue = 1;
else else
newvalue = (relX - handleRadius) / (width - 2 * handleRadius); newvalue = (relX - this._handleRadius) / (width - 2 * this._handleRadius);
this.value = newvalue * this._maxValue; this.value = newvalue * this._maxValue;
} }