Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mutter-css-crash-fix' into 'gtk-3-24'

Browse Source 
Adwaita: Ensure SSD decorations do not change size when losing focus

See merge request GNOME/gtk!3256
This commit is contained in:
Matthias Clasen
2021-03-05 15:47:08 +00:00
parent 57cc7dce81 392e52187d
commit 782bbca52c
5 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4598,7 +4598,9 @@ decoration {
.popup & { box-shadow: none; }
// server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
// just doing borders, wm draws actual shadows
.ssd & { box-shadow: 0 0 0 1px $_wm_border; }
.ssd &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; }
.csd.popup & {
border-radius: $menu_radius;

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

@@ -1848,6 +1848,8 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(
.ssd decoration { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.8); }
tooltip.csd decoration { border-radius: 5px; box-shadow: none; }

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

@@ -1864,6 +1864,8 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(
.ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
tooltip.csd decoration { border-radius: 5px; box-shadow: none; }

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

@@ -1928,6 +1928,8 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(
.ssd decoration { box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9); }
.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(104, 104, 104, 0.8); }
tooltip.csd decoration { border-radius: 5px; box-shadow: none; }

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

@@ -1944,6 +1944,8 @@ decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(
.ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
.ssd decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
tooltip.csd decoration { border-radius: 5px; box-shadow: none; }