AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

themes: Restore default progressbar min sizes

Browse Source 
The min size on the oriented axis used to come from style props with
default values in the source file, used if the theme did not provide a
min size in CSS. When the style props were removed, so was any notion of
a minimal size for proressbars' main axis, meaning that now progressbars
without expand or any other source of min size were just tiny specks.

The right place to do that was always the theme, so in our themes now,
fix that by copying the old default values for the style properties; see:

https://gitlab.gnome.org/GNOME/gtk/issues/1191#note_259393
https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-24/gtk/gtkprogressbar.c#L92

The result should be the same in that (A) the min size is now what it is
in GTK+ 3 & (B) an app/user can override the theme exactly the same way.

Close https://gitlab.gnome.org/GNOME/gtk/issues/1192
This commit is contained in:
Daniel Boles 2018-07-03 18:55:31 +01:00
parent 55a1f8ccfd
commit 14620423e8
6 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/theme/Adwaita/_common.scss
View File

@ -3320,11 +3320,15 @@ scale {
progressbar {
// sizing
&.horizontal {
trough { min-width: 150px; }
trough,
progress { min-height: 2px; }
}
&.vertical {
trough { min-height: 80px; }
trough,
progress { min-width: 2px; }
}

4
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -1444,8 +1444,12 @@ scale.color.fine-tune.vertical:dir(rtl) slider { margin-right: -15px; margin-lef
/***************** Progress bars * */
progressbar { font-size: smaller; color: rgba(238, 238, 236, 0.4); }
progressbar.horizontal trough { min-width: 150px; }
progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; }
progressbar.vertical trough { min-height: 80px; }
progressbar.vertical trough, progressbar.vertical progress { min-width: 2px; }
progressbar.horizontal progress { margin: 0 -1px; }

4
gtk/theme/Adwaita/gtk-contained.css
View File

@ -1464,8 +1464,12 @@ scale.color.fine-tune.vertical:dir(rtl) slider { margin-right: -15px; margin-lef
/***************** Progress bars * */
progressbar { font-size: smaller; color: rgba(46, 52, 54, 0.4); }
progressbar.horizontal trough { min-width: 150px; }
progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; }
progressbar.vertical trough { min-height: 80px; }
progressbar.vertical trough, progressbar.vertical progress { min-width: 2px; }
progressbar.horizontal progress { margin: 0 -1px; }

4
gtk/theme/HighContrast/_common.scss
View File

@ -2499,11 +2499,15 @@ progressbar {
// moving bit
&.horizontal {
trough { min-width: 150px; }
trough, progress { min-height: 2px; }
}
&.vertical {
trough { min-height: 80px; }
trough, progress { min-width: 2px; }
}
& progress {
border-width: 1px;
border-style: solid;

4
gtk/theme/HighContrast/gtk-contained-inverse.css
View File

@ -1105,8 +1105,12 @@ progressbar trough:backdrop { border-color: #737373; background-color: #282828;
progressbar.osd trough { background-color: transparent; box-shadow: none; border-width: 0; }
progressbar.horizontal trough { min-width: 150px; }
progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; }
progressbar.vertical trough { min-height: 80px; }
progressbar.vertical trough, progressbar.vertical progress { min-width: 2px; }
progressbar progress { border-width: 1px; border-style: solid; border-radius: 3px; border-color: #aaa; background-color: #ddd; box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.2); }

4
gtk/theme/HighContrast/gtk-contained.css
View File

@ -1111,8 +1111,12 @@ progressbar trough:backdrop { border-color: #8d8d8d; background-color: #d7d7d7;
progressbar.osd trough { background-color: transparent; box-shadow: none; border-width: 0; }
progressbar.horizontal trough { min-width: 150px; }
progressbar.horizontal trough, progressbar.horizontal progress { min-height: 2px; }
progressbar.vertical trough { min-height: 80px; }
progressbar.vertical trough, progressbar.vertical progress { min-width: 2px; }
progressbar progress { border-width: 1px; border-style: solid; border-radius: 3px; border-color: #000; background-color: #000; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2); }