From 7146c0986796ad0a09d071494477787a4c8edeba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniel@drasite.com>
Date: Mon, 2 Mar 2020 11:56:24 +0100
Subject: [PATCH] GTK3: Roud bottom decoration edges

---
 share/themes/Kali-Dark/gtk-3.0/gtk.css        | 22 +++++++++---
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  | 22 +++++++++---
 share/themes/Kali-Light/gtk-3.0/gtk.css       | 22 +++++++++---
 .../Kali/sass/gtk-sass/_common-tweaks.scss    | 35 ++++++++++++++++---
 4 files changed, 85 insertions(+), 16 deletions(-)

diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 78c32aa9..84ece18d 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5507,15 +5507,29 @@ messagedialog .titlebar:backdrop {
  * Window Decorations *
  *********************/
 decoration {
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4); }
+  border-radius: 9px 9px 5px 5px;
+  border: 1px solid #272a34;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(13, 14, 17, 0.75); }
   decoration:backdrop {
     box-shadow: 0 2px 8px 0 transparent, 0 0 0 3px rgba(0, 0, 0, 0.25); }
+  .maximized decoration,
+  .fullscreen decoration,
+  .tiled decoration,
+  .tiled-top decoration,
+  .tiled-right decoration,
+  .tiled-bottom decoration,
+  .tiled-left decoration {
+    border-width: 0; }
+  .popup decoration {
+    border-width: 0; }
   .ssd decoration {
-    box-shadow: none; }
+    box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.75);
+    border-width: 0; }
   .csd.popup decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65);
+    border-width: 0; }
   messagedialog.csd decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
 
 button.titlebutton:backdrop {
   border-color: transparent; }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index 78c32aa9..84ece18d 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5507,15 +5507,29 @@ messagedialog .titlebar:backdrop {
  * Window Decorations *
  *********************/
 decoration {
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4); }
+  border-radius: 9px 9px 5px 5px;
+  border: 1px solid #272a34;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(13, 14, 17, 0.75); }
   decoration:backdrop {
     box-shadow: 0 2px 8px 0 transparent, 0 0 0 3px rgba(0, 0, 0, 0.25); }
+  .maximized decoration,
+  .fullscreen decoration,
+  .tiled decoration,
+  .tiled-top decoration,
+  .tiled-right decoration,
+  .tiled-bottom decoration,
+  .tiled-left decoration {
+    border-width: 0; }
+  .popup decoration {
+    border-width: 0; }
   .ssd decoration {
-    box-shadow: none; }
+    box-shadow: 0 0 0 1px rgba(13, 14, 17, 0.75);
+    border-width: 0; }
   .csd.popup decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65);
+    border-width: 0; }
   messagedialog.csd decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(13, 14, 17, 0.65); }
 
 button.titlebutton:backdrop {
   border-color: transparent; }
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 0ccaa5b8..038c93f6 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5530,15 +5530,29 @@ messagedialog .titlebar:backdrop {
  * Window Decorations *
  *********************/
 decoration {
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4); }
+  border-radius: 9px 9px 5px 5px;
+  border: 1px solid #fafafa;
+  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(0, 0, 0, 0.1); }
   decoration:backdrop {
     box-shadow: 0 2px 8px 0 transparent, 0 0 0 3px rgba(0, 0, 0, 0.15); }
+  .maximized decoration,
+  .fullscreen decoration,
+  .tiled decoration,
+  .tiled-top decoration,
+  .tiled-right decoration,
+  .tiled-bottom decoration,
+  .tiled-left decoration {
+    border-width: 0; }
+  .popup decoration {
+    border-width: 0; }
   .ssd decoration {
-    box-shadow: none; }
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.1);
+    border-width: 0; }
   .csd.popup decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0);
+    border-width: 0; }
   messagedialog.csd decoration {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2); }
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0); }
 
 button.titlebutton:backdrop {
   border-color: transparent; }
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 31cfc0d3..27b2e65e 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -221,18 +221,45 @@ messagedialog .titlebar:backdrop { background-image: none; }
  * Window Decorations *
  *********************/
 decoration {
-  box-shadow: 0 2px 8px 0 transparentize(black, 0.6);
+  $_border_width: 1px;
+  border-radius: $window_radius+$_border_width $window_radius+$_border_width $button_radius $button_radius;
+  border: $_border_width solid $base_color;
+
+  $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize($borders_color, 0.25));
+
+  box-shadow: 0 2px 8px 0 transparentize(black, 0.6),
+              0 0 0 1px $_wm_border;
 
   &:backdrop {
     box-shadow: 0 2px 8px 0 transparent,
                 0 0 0 3px if($variant == 'light', transparentize(black, .85), transparentize(black, .75));
   }
 
-  .ssd & { box-shadow: none; }
+  .maximized &,
+  .fullscreen &,
+  .tiled &,
+  .tiled-top &,
+  .tiled-right &,
+  .tiled-bottom &,
+  .tiled-left & { border-width: 0; }
 
-  .csd.popup & { box-shadow: 0 1px 4px transparentize(black, 0.8); }
+  .popup & { border-width: 0; }
 
-  messagedialog.csd & { box-shadow: 0 1px 4px transparentize(black, 0.8); }
+  .ssd & {
+    box-shadow: 0 0 0 1px $_wm_border;
+    border-width: 0;
+  }
+
+  .csd.popup & {
+    box-shadow: 0 1px 4px transparentize(black, 0.8),
+                0 0 0 1px transparentize($_wm_border, 0.1);
+    border-width: 0;
+  }
+
+  messagedialog.csd & {
+    box-shadow: 0 1px 4px transparentize(black, 0.8),
+                0 0 0 1px transparentize($_wm_border, 0.1);
+  }
 }
 
 // Window Close button