callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/jimmac/scrollbars-fine-tune-fix-gtk3' into 'gtk-3-24'

Browse Source 
Adwaita: Avoid fine-tune scrollbars jumping

See merge request GNOME/gtk!3210
This commit is contained in:
Matthias Clasen 2021-02-16 12:26:13 +00:00
commit 03b97b0a8b
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2642,6 +2642,7 @@ scrollbar {
$_slider_min_length: 40px;
$_slider_width: 8px;
$_scrollbar_transition: all 300ms $ease-out-quad;
$_fine-tune_slider_border: $_slider_width - 3; //3672
// disable steppers
@at-root * {
@ -2686,12 +2687,13 @@ scrollbar {
&.fine-tune {
slider {
min-width: $_slider_width - 2;
min-height: $_slider_width - 2;
transition: none;
min-width: $_fine-tune_slider_border+1;
min-height: $_fine-tune_slider_border+1;
}
&.horizontal slider { border-width: 6px 4px; }
&.vertical slider { border-width: 4px 6px; }
&.horizontal slider { border-width: $_fine-tune_slider_border 4px; }
&.vertical slider { border-width: 4px $_fine-tune_slider_border; }
}
&.overlay-indicator {

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

@ -994,11 +994,11 @@ scrollbar slider:backdrop { background-color: #5a5a59; }
scrollbar slider:disabled { background-color: transparent; }
scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
scrollbar.fine-tune slider { transition: none; min-width: 6px; min-height: 6px; }
scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }

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

@ -1002,11 +1002,11 @@ scrollbar slider:backdrop { background-color: #cecfce; }
scrollbar slider:disabled { background-color: transparent; }
scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
scrollbar.fine-tune slider { transition: none; min-width: 6px; min-height: 6px; }
scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }

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

@ -1074,11 +1074,11 @@ scrollbar slider:backdrop { background-color: #5a5a59; }
scrollbar slider:disabled { background-color: transparent; }
scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
scrollbar.fine-tune slider { transition: none; min-width: 6px; min-height: 6px; }
scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }

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

@ -1082,11 +1082,11 @@ scrollbar slider:backdrop { background-color: #cecfce; }
scrollbar slider:disabled { background-color: transparent; }
scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
scrollbar.fine-tune slider { transition: none; min-width: 6px; min-height: 6px; }
scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }