From 92ba63fe1cc6802f715ae5895ec579dd3a215f3e Mon Sep 17 00:00:00 2001
From: Jacco Krijnen <jaccokrijnen@gmail.com>
Date: Fri, 16 Sep 2016 02:19:47 +0200
Subject: [PATCH] Fix windows border problem with smaller radius box-shadow

---
 win32/etc/gtk-3.0/settings.ini                         | 2 +-
 win32/share/themes/Windows10/gtk-3.0/gtk-contained.css | 8 +++++---
 win32/share/themes/Windows10/gtk-3.0/gtk-dark.css      | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/win32/etc/gtk-3.0/settings.ini b/win32/etc/gtk-3.0/settings.ini
index 1fe7439d..1a97fa6a 100644
--- a/win32/etc/gtk-3.0/settings.ini
+++ b/win32/etc/gtk-3.0/settings.ini
@@ -10,4 +10,4 @@ gtk-xft-rgba=rgb
 
 
 gtk-theme-name=Windows10
-gtk-font-name=Segoe UI Normal 9
\ No newline at end of file
+gtk-font-name=Segoe UI Normal 9
diff --git a/win32/share/themes/Windows10/gtk-3.0/gtk-contained.css b/win32/share/themes/Windows10/gtk-3.0/gtk-contained.css
index 0064db36..dcb6bfc1 100644
--- a/win32/share/themes/Windows10/gtk-3.0/gtk-contained.css
+++ b/win32/share/themes/Windows10/gtk-3.0/gtk-contained.css
@@ -784,7 +784,7 @@ menubar,
   background-color: transparent; }
   menubar > menuitem,
   .menubar > menuitem {
-    padding: 2px 4px;
+    padding: 2px 8px 2px 8px;
 	border: 1px solid transparent; }
     menubar > menuitem:hover,
     .menubar > menuitem:hover
@@ -801,14 +801,16 @@ menu,
 .menu {
   padding: 0px;
   background-color: @theme_bg_color;
+  border: 1px solid @borders;
   }
   menu menuitem,
   .menu menuitem {
     padding: 4px;
+    border: 1px solid transparent;
     }
     menu menuitem:hover,
     .menu menuitem:hover {
-    border: 1px solid @menubaritem_border;
+        border: 1px solid @menubaritem_border;
 	background-color: @menubaritem_bg_color;
 	color: @theme_fg_color;}
     menu menuitem:disabled,
@@ -1849,7 +1851,7 @@ GtkColorChooserWidget #add-color-button {
  *********************/
 decoration {
   /*border-radius: 7px 7px 0 0;*/
-  border: 1px solid @borders;
+  box-shadow: 0 1 2 1 rgba(0,0,0,0.2);
   /* this is used for the resize cursor area */
   margin: 10px; }
   decoration.tiled {
diff --git a/win32/share/themes/Windows10/gtk-3.0/gtk-dark.css b/win32/share/themes/Windows10/gtk-3.0/gtk-dark.css
index fced30b1..b174fa4d 100644
--- a/win32/share/themes/Windows10/gtk-3.0/gtk-dark.css
+++ b/win32/share/themes/Windows10/gtk-3.0/gtk-dark.css
@@ -10,7 +10,7 @@
 @define-color theme_fg_color #c0c0c0;
 @define-color theme_text_color @theme_fg_color;
 @define-color theme_selected_bg_color #0079cb;
-@define-color theme_selected_fg_color #e9e9e9; 
+@define-color theme_selected_fg_color #e9e9e9;
 
 /* dark visualstudio 2013
  @define-color
@@ -24,7 +24,7 @@
 @define-color borders shade(@theme_bg_color, 0.68);	/* #ACACAC; */
 
 @define-color insensitive_bg_color  shade (@theme_bg_color, 0.99);
-@define-color insensitive_fg_color  shade (@theme_bg_color, 0.72);
+@define-color insensitive_fg_color  shade (@theme_fg_color, 0.72);
 @define-color insensitive_borders   shade (@theme_bg_color, 0.84);	/* #bbbbbb; */