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

Adwaita: ensure titlebar corners are not rounded...

Browse Source 
...when the window is maximized or tiled, by using more specific
selectors, since there were cases of erroneusly rounded corners.
See https://bugzilla.gnome.org/show_bug.cgi?id=765038
This commit is contained in:
Lapo Calamandrei 2016-04-16 11:58:14 +02:00
parent 64c2a65cc0
commit 8ee4e45f8a
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1534,7 +1534,7 @@ headerbar {
}
}
.titlebar {
window:not(.tiled):not(.maximized) .titlebar {
&, &:backdrop {
border-top-left-radius: 7px;
border-top-right-radius: 7px;
@ -1542,10 +1542,10 @@ headerbar {
}
headerbar {
separator:first-child + &, // tackles the paned container case
&:first-child { &, &:backdrop { border-top-left-radius: 7px; }}
window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case
window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }}
&:last-child { &, &:backdrop { border-top-right-radius: 7px; }}
window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }}
}
.titlebar:not(headerbar) {
@ -4163,6 +4163,7 @@ decoration {
transition: $backdrop_transition;
}
.maximized &,
.fullscreen &,
.tiled & { border-radius: 0; }

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

@ -1947,13 +1947,13 @@ headerbar button {
margin-top: 6px;
margin-bottom: 6px; }
.titlebar, .titlebar:backdrop {
window:not(.tiled):not(.maximized) .titlebar, window:not(.tiled):not(.maximized) .titlebar:backdrop {
border-top-left-radius: 7px;
border-top-right-radius: 7px; }
separator:first-child + headerbar, separator:first-child + headerbar:backdrop, headerbar:first-child, headerbar:first-child:backdrop {
window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child {
border-top-left-radius: 7px; }
headerbar:last-child, headerbar:last-child:backdrop {
window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child {
border-top-right-radius: 7px; }
window.csd > .titlebar:not(headerbar) {
@ -4369,7 +4369,7 @@ decoration {
decoration:backdrop {
box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9);
transition: 200ms ease-out; }
.fullscreen decoration, .tiled decoration {
.maximized decoration, .fullscreen decoration, .tiled decoration {
border-radius: 0; }
.popup decoration {
box-shadow: none; }

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

@ -1954,13 +1954,13 @@ headerbar button {
margin-top: 6px;
margin-bottom: 6px; }
.titlebar, .titlebar:backdrop {
window:not(.tiled):not(.maximized) .titlebar, window:not(.tiled):not(.maximized) .titlebar:backdrop {
border-top-left-radius: 7px;
border-top-right-radius: 7px; }
separator:first-child + headerbar, separator:first-child + headerbar:backdrop, headerbar:first-child, headerbar:first-child:backdrop {
window:not(.tiled):not(.maximized) separator:first-child + headerbar:backdrop, window:not(.tiled):not(.maximized) separator:first-child + headerbar, window:not(.tiled):not(.maximized) headerbar:first-child:backdrop, window:not(.tiled):not(.maximized) headerbar:first-child {
border-top-left-radius: 7px; }
headerbar:last-child, headerbar:last-child:backdrop {
window:not(.tiled):not(.maximized) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized) headerbar:last-child {
border-top-right-radius: 7px; }
window.csd > .titlebar:not(headerbar) {
@ -4398,7 +4398,7 @@ decoration {
decoration:backdrop {
box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18);
transition: 200ms ease-out; }
.fullscreen decoration, .tiled decoration {
.maximized decoration, .fullscreen decoration, .tiled decoration {
border-radius: 0; }
.popup decoration {
box-shadow: none; }