edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

osdWindow: Reuse BarLevel drawing functionality

Browse source 
Reuse the BarLevel class to get similar drawing behavior as Slider.
Rename theme css impacted properties and ensure that the osdWindow
remains accessible.
Ensure we don't force setting a custom border color like on the OSD.

https://bugzilla.gnome.org/show_bug.cgi?id=790280.
This commit is contained in:
Didier Roche 2018-02-08 19:22:29 +01:00 • committed by Florian Müllner
parent c90a4e4849
commit ed8e89bc19
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/ui/barLevel.js
View file

@ -60,9 +60,15 @@ var BarLevel = new Lang.Class({
let barLevelColor = themeNode.get_color('-barlevel-background-color');
let barLevelActiveColor = themeNode.get_color('-barlevel-active-background-color');
let barLevelBorderWidth = themeNode.get_length('-barlevel-border-width');
let barLevelBorderColor = themeNode.get_color('-barlevel-border-color');
let barLevelActiveBorderColor = themeNode.get_color('-barlevel-active-border-color');
let barLevelBorderWidth = Math.min(themeNode.get_length('-barlevel-border-width'), 1);
let [hasBorderColor, barLevelBorderColor] =
themeNode.lookup_color('-barlevel-border-color', false);
if (!hasBorderColor)
barLevelBorderColor = barLevelColor;
let [hasActiveBorderColor, barLevelActiveBorderColor] =
themeNode.lookup_color('-barlevel-active-border-color', false);
if (!hasActiveBorderColor)
barLevelActiveBorderColor = barLevelActiveColor;
const TAU = Math.PI * 2;