Commit 2adf8071 authored by abgr's avatar abgr
Browse files

auto-adjust scrollbar opacity, reworking lxqt themes, more

parent ae45e1b7
selection #4444bb 1
bg #111111 0.75
bg-border #aaaaaa 0.75
bg-topleft #007777 0.575
bg-bottomright #770000 0.575
bg-topleft #777700 0.575
bg-bottomright #000077 0.575
bg-hover #ffffff 0.167
bg-pressed #000000 1
view #000000 0.667
......
......@@ -5,8 +5,8 @@ bg-topleft #ffffff 0.75
bg-bottomright #000000 0.167
bg-hover #ffffff 0.167
bg-pressed #000000 0.25
view #d5d5d5 1
view-hover #e0e0e0 1
view #dfdfdf 0.8
view-hover #dfdfdf 1
text-selection #ffffff 1
text-bg #000000 1
text-view #000000 1
This diff is collapsed.
This diff is collapsed.
......@@ -61,11 +61,11 @@
<stop
id="stop4885"
offset="0"
style="stop-color:#007777;stop-opacity:0.575;" />
style="stop-color:#777700;stop-opacity:0.575;" />
<stop
id="stop4887"
offset="1"
style="stop-color:#770000;stop-opacity:0.575" />
style="stop-color:#000077;stop-opacity:0.575" />
</linearGradient>
<linearGradient
inkscape:collect="always"
......@@ -125,7 +125,7 @@
d="M 6,33 A 3,3 0 0 0 3,36 H 5 A 1,1 0 0 1 6,35 Z"
id="path4524" />
<path
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,35 A 1,1 0 0 0 5,36 H 6 Z"
id="path4530"
inkscape:connector-curvature="0" />
......@@ -182,7 +182,7 @@
d="m 14,43 a 1,1 0 0 1 -1,1 v 2 a 3,3 0 0 0 3,-3 z"
id="path4524-1" />
<path
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 13,43 v 1 a 1,1 0 0 0 1,-1 z"
id="path4530-0"
inkscape:connector-curvature="0" />
......@@ -205,7 +205,7 @@
x="7"
y="30" />
<rect
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851"
width="5"
height="1"
......@@ -230,7 +230,7 @@
x="7"
y="47" />
<rect
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851-1"
width="5"
height="1"
......@@ -255,7 +255,7 @@
x="0"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868"
width="1"
height="5"
......@@ -280,7 +280,7 @@
x="17"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868-2"
width="1"
height="5"
......
......@@ -61,11 +61,11 @@
<stop
id="stop4885"
offset="0"
style="stop-color:#007777;stop-opacity:0.575;" />
style="stop-color:#777700;stop-opacity:0.575;" />
<stop
id="stop4887"
offset="1"
style="stop-color:#770000;stop-opacity:0.575" />
style="stop-color:#000077;stop-opacity:0.575" />
</linearGradient>
<linearGradient
gradientUnits="userSpaceOnUse"
......@@ -123,7 +123,7 @@
id="path4521"
inkscape:connector-curvature="0" />
<path
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="M 6,32 A 4,4 0 0 0 2,36 H 3 A 3,3 0 0 1 6,33 Z"
id="path4523"
inkscape:connector-curvature="0" />
......@@ -180,7 +180,7 @@
id="path4521-9"
inkscape:connector-curvature="0" />
<path
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
d="m 16,43 a 3,3 0 0 1 -3,3 v 1 a 4,4 0 0 0 4,-4 z"
id="path4523-3"
inkscape:connector-curvature="0" />
......@@ -203,7 +203,7 @@
x="7"
y="30" />
<rect
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851"
width="5"
height="1"
......@@ -228,7 +228,7 @@
x="7"
y="47" />
<rect
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4851-1"
width="5"
height="1"
......@@ -253,7 +253,7 @@
x="0"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#007777;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#777700;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868"
width="1"
height="5"
......@@ -278,7 +278,7 @@
x="17"
y="37" />
<rect
style="opacity:1;vector-effect:none;fill:#770000;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
style="opacity:1;vector-effect:none;fill:#000077;fill-opacity:0.575;stroke:none;stroke-width:0.78315598;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8.30000019;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
id="rect4868-2"
width="1"
height="5"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
selection #4444bb 1
bg #111111 0.75
bg-border #aaaaaa 0.75
bg-topleft #007777 0.575
bg-bottomright #770000 0.575
bg-topleft #777700 0.575
bg-bottomright #000077 0.575
bg-hover #ffffff 0.167
bg-pressed #000000 1
view #000000 0.667
......
......@@ -5,8 +5,8 @@ bg-topleft #ffffff 0.75
bg-bottomright #000000 0.167
bg-hover #ffffff 0.167
bg-pressed #000000 0.25
view #d5d5d5 1
view-hover #e0e0e0 1
view #dfdfdf 0.8
view-hover #dfdfdf 1
text-selection #ffffff 1
text-bg #000000 1
text-view #000000 1
......@@ -27,8 +27,31 @@ while read key val alpha; do
alpha[$key]=$alpha
done < "colors.$colorscheme"
for file in *.svg *.kvconfig; do
# Calculate opacity of scrollbars/sliders, which are rendered on top of (also translucent) widgets, assuming an average background value (0-255)
avg_bg_brightness=85
bg_brightness=$(bc <<< "($((0x$(echo ${colors_theme[bg]} | cut -b2-3))) + \
$((0x$(echo ${colors_theme[bg]} | cut -b4-5))) + \
$((0x$(echo ${colors_theme[bg]} | cut -b6-7)))) / 3")
bg_pressed_brightness=$(bc <<< "($((0x$(echo ${colors_theme[bg-pressed]} | cut -b2-3))) + \
$((0x$(echo ${colors_theme[bg-pressed]} | cut -b4-5))) + \
$((0x$(echo ${colors_theme[bg-pressed]} | cut -b6-7)))) / 3")
bg_alpha=${alpha[bg]}
bg_pressed_alpha=${alpha[bg-pressed]}
scrollbar_alpha=$(bc -l <<< "($bg_pressed_alpha*($avg_bg_brightness*($bg_alpha-1)+$bg_pressed_brightness-$bg_brightness*$bg_alpha))/($bg_alpha*($avg_bg_brightness*($bg_pressed_alpha-1)*($bg_alpha-1)+$bg_pressed_brightness*$bg_pressed_alpha+$bg_brightness*(-1*$bg_pressed_alpha*$bg_alpha+$bg_alpha-1)))")
min=$(echo 1 $scrollbar_alpha | tr ' ' '\n' | sort -n | head -1)
max=$(echo 0 $min | tr ' ' '\n' | sort -n | tail -1)
scrollbar_alpha=$max
for i in ${!colors_source[@]}; do
hexalpha=$(printf %02x $(bc <<< "(255 * ${alpha[$i]} + 0.5) / 1"))
sed -i "s/${colors_source[$i]}/${colors_theme[$i]}$hexalpha/" *.kvconfig
done
for file in *.svg; do
sed -i '/#ff00ff/s/fill-opacity:1/fill-opacity:0/' $file
sed -i "/#808080/s/opacity:0.751/opacity:$scrollbar_alpha/" $file
for i in ${!colors_source[@]}; do
sed -i "/${colors_source[$i]}/s/fill-opacity:1/fill-opacity:${alpha[$i]}/g" $file
......
......@@ -36,25 +36,25 @@ translucent_windows=true
blurring=true
[GeneralColors]
window.color=#bfbfbf
base.color=#dfdfdf
alt.base.color=#dfdfdf
button.color=#bfbfbf
light.color=#88ffff55
mid.light.color=#ff88882b
window.color=#bfbfbfb5
base.color=#dfdfdfcc
alt.base.color=#dfdfdfcc
button.color=#bfbfbfb5
light.color=#88ffff6055
mid.light.color=#ff8888602b
mid.color=#000000
dark.color=#000000
highlight.color=#4444bb
inactive.highlight.color=#4444bb80
tooltip.base.color=#dfdfdf
text.color=#000000
window.text.color=#000000
button.text.color=#000000
disabled.text.color=#00000080
tooltip.text.color=#000000
highlight.text.color=#ffffff
progress.indicator.text.color=#ffffff
progress.inactive.indicator.text.color=#ffffff
highlight.color=#4444bbff
inactive.highlight.color=#4444bbff80
tooltip.base.color=#dfdfdfcc
text.color=#000000ff
window.text.color=#000000ff
button.text.color=#000000ff
disabled.text.color=#000000ff80
tooltip.text.color=#000000ff
highlight.text.color=#ffffffff
progress.indicator.text.color=#ffffffff
progress.inactive.indicator.text.color=#ffffffff
[Hacks]
transparent_pcmanfm_sidepane=true
......@@ -137,10 +137,10 @@ inherits=PanelButtonCommand
[ToolboxTab]
inherits=PanelButtonCommand
text.normal.color=#000000
text.focus.color=#000000
text.press.color=#000000
text.toggle.color=#000000
text.normal.color=#000000ff
text.focus.color=#000000ff
text.press.color=#000000ff
text.toggle.color=#000000ff
[Tab]
inherits=PanelButtonCommand
......@@ -192,7 +192,7 @@ indicator.element=sizegrip
[Toolbar]
inherits=PanelButtonCommand
text.normal.color=#000000
text.normal.color=#000000ff
frame.top=0
frame.bottom=1
frame.left=1
......@@ -246,8 +246,8 @@ interior.element=progress-pattern
inherits=PanelButtonCommand
text.margin=0
frame=false
text.press.color=#ffffff
text.toggle.color=#ffffff
text.press.color=#ffffffff
text.toggle.color=#ffffffff
interior.element=itemview
[Splitter]
......@@ -301,8 +301,8 @@ frame.top=7
frame.bottom=7
frame.left=7
frame.right=7
text.normal.color=#000000
text.focus.color=#000000
text.normal.color=#000000ff
text.focus.color=#000000ff
[ToolTip]
inherits=PanelButtonCommand
......
......@@ -36,25 +36,25 @@ translucent_windows=true
blurring=true
[GeneralColors]
window.color=#bfbfbf
base.color=#dfdfdf
alt.base.color=#dfdfdf
button.color=#bfbfbf
light.color=#ffffff55
mid.light.color=#ffffff2b
window.color=#bfbfbfb5
base.color=#dfdfdfcc
alt.base.color=#dfdfdfcc
button.color=#bfbfbfb5
light.color=#ffffff4055
mid.light.color=#ffffff202b
mid.color=#000000
dark.color=#000000
highlight.color=#4444bb
inactive.highlight.color=#4444bb80
tooltip.base.color=#dfdfdf
text.color=#000000
window.text.color=#000000
button.text.color=#000000
disabled.text.color=#00000080
tooltip.text.color=#000000
highlight.text.color=#ffffff
progress.indicator.text.color=#ffffff
progress.inactive.indicator.text.color=#ffffff
highlight.color=#4444bbff
inactive.highlight.color=#4444bbff80
tooltip.base.color=#dfdfdfcc
text.color=#000000ff
window.text.color=#000000ff
button.text.color=#000000ff
disabled.text.color=#000000ff80
tooltip.text.color=#000000ff
highlight.text.color=#ffffffff
progress.indicator.text.color=#ffffffff
progress.inactive.indicator.text.color=#ffffffff
[Hacks]
transparent_pcmanfm_sidepane=true
......@@ -137,10 +137,10 @@ inherits=PanelButtonCommand
[ToolboxTab]
inherits=PanelButtonCommand
text.normal.color=#000000
text.focus.color=#000000
text.press.color=#000000
text.toggle.color=#000000
text.normal.color=#000000ff
text.focus.color=#000000ff
text.press.color=#000000ff
text.toggle.color=#000000ff
[Tab]
inherits=PanelButtonCommand
......@@ -192,7 +192,7 @@ indicator.element=sizegrip
[Toolbar]
inherits=PanelButtonCommand
text.normal.color=#000000
text.normal.color=#000000ff
frame.top=0
frame.bottom=1
frame.left=1
......@@ -246,8 +246,8 @@ interior.element=progress-pattern
inherits=PanelButtonCommand
text.margin=0
frame=false
text.press.color=#ffffff
text.toggle.color=#ffffff
text.press.color=#ffffffff
text.toggle.color=#ffffffff
interior.element=itemview
[Splitter]
......@@ -301,8 +301,8 @@ frame.top=7
frame.bottom=7
frame.left=7
frame.right=7
text.normal.color=#000000
text.focus.color=#000000
text.normal.color=#000000ff
text.focus.color=#000000ff
[ToolTip]
inherits=PanelButtonCommand
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment