From 35adc7ed0456adcf1c98ad70e9e00b942f8e7d18 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 11 Feb 2021 15:24:59 +0100 Subject: [PATCH] Adwaita: Bring back borders of tiled windows Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3661 --- gtk/theme/Adwaita/_common.scss | 10 ++++++++-- gtk/theme/Adwaita/gtk-contained-dark.css | 6 +++++- gtk/theme/Adwaita/gtk-contained.css | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 4510cfa784..581da9ef45 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4574,12 +4574,18 @@ decoration { } .maximized &, - .fullscreen &, + .fullscreen & { border-radius: 0; box-shadow: none; } + .tiled &, .tiled-top &, .tiled-right &, .tiled-bottom &, - .tiled-left & { border-radius: 0; box-shadow: none; } + .tiled-left & { + border-radius: 0; + box-shadow: 0 0 0 1px $_wm_border_backdrop; + + &:backdrop { box-shadow: 0 0 0 1px $_wm_border_backdrop; } + } .popup & { box-shadow: none; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index a0e94dc079..9bb4c1c2fb 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1838,7 +1838,11 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.9); transition: 200ms ease-out; } -.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: none; } +.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; } + +.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); } + +.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); } .popup decoration { box-shadow: none; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 56b3af7641..6a429b32f3 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1854,7 +1854,11 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p 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; } -.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: none; } +.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; } + +.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); } + +.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); } .popup decoration { box-shadow: none; }