update Aldabra gtk-2.0 and metacity-1 from new upstream release

gtk-3.0 need testing before

5 files changed, 23 insertions, 8 deletions

diff --git a/desktop-themes/Aldabra/gtk-2.0/assets/tab-bottom-active.png b/desktop-themes/Aldabra/gtk-2.0/assets/tab-bottom-active.png
index 775d5509..66bc0efb 100644
--- a/desktop-themes/Aldabra/gtk-2.0/assets/tab-bottom-active.png
+++ b/desktop-themes/Aldabra/gtk-2.0/assets/tab-bottom-active.png
diff --git a/desktop-themes/Aldabra/gtk-2.0/assets/tab-left-active.png b/desktop-themes/Aldabra/gtk-2.0/assets/tab-left-active.png
index 096d6051..adabfb2d 100644
--- a/desktop-themes/Aldabra/gtk-2.0/assets/tab-left-active.png
+++ b/desktop-themes/Aldabra/gtk-2.0/assets/tab-left-active.png
diff --git a/desktop-themes/Aldabra/gtk-2.0/assets/tab-right-active.png b/desktop-themes/Aldabra/gtk-2.0/assets/tab-right-active.png
index fedb8ebe..75f46c05 100644
--- a/desktop-themes/Aldabra/gtk-2.0/assets/tab-right-active.png
+++ b/desktop-themes/Aldabra/gtk-2.0/assets/tab-right-active.png
diff --git a/desktop-themes/Aldabra/gtk-2.0/assets/tab-top-active.png b/desktop-themes/Aldabra/gtk-2.0/assets/tab-top-active.png
index 48b2577f..1571ac25 100644
--- a/desktop-themes/Aldabra/gtk-2.0/assets/tab-top-active.png
+++ b/desktop-themes/Aldabra/gtk-2.0/assets/tab-top-active.png
diff --git a/desktop-themes/Aldabra/gtk-2.0/gtkrc b/desktop-themes/Aldabra/gtk-2.0/gtkrc
index 0a97f3fb..96cbf894 100644
--- a/desktop-themes/Aldabra/gtk-2.0/gtkrc
+++ b/desktop-themes/Aldabra/gtk-2.0/gtkrc
@@ -23,8 +23,9 @@ style "default" {
 
 	GtkExpander	::expander-size		= 14
 
-	GtkMenuBar	::internal-padding	= 2
+	GtkMenuBar	::internal-padding	= 0
 	GtkMenuBar	::shadow-type		= GTK_SHADOW_NONE
+	GtkMenuBar	::window-dragging	= 1
 	GtkMenu		::horizontal-padding	= 0
 	GtkMenu		::vertical-padding	= 0
 	GtkSeparatorMenuItem	::horizontal-padding = 7
@@ -48,6 +49,7 @@ style "default" {
 	GtkScrollbar	::min-slider-length	= 32
 
 	GtkToolbar	::internal-padding	= 5
+	GtkToolbar	::window-dragging	= 1
 
 	GtkTreeView	::expander-size		= 14
 	GtkTreeView	::odd_row_color		= "#FFF"
@@ -100,7 +102,7 @@ style "default" {
 		menubaritemstyle	= 1 # 0 = menuitem look, 1 = button look
 		menubarstyle		= 2 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
 		menuitemstyle		= 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle		= 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe
+		menustyle		= 3 # 0 = no vertical menu stripe, 1 = display vertical menu stripe, 2 = faint? 3 = borderless
 		progressbarstyle	= 1
 		reliefstyle		= 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
 		rgba			= FALSE	# alpha transparency
@@ -283,13 +285,13 @@ style "menubar" {
 
 	engine "murrine" {
 		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-		roundness		= 3 # 0 = squared
+		roundness		= 6 # 0 = squared
 	}
 }
 
 style "menu" {
-	xthickness	= 3
-	ythickness	= 3
+	xthickness	= 0
+	ythickness	= 0
 
 	bg[NORMAL]	= shade (1.08, @bg_color)
 
@@ -297,23 +299,31 @@ style "menu" {
 
 	engine "murrine" {
 		gradient_shades		= {1.0, 1.0, 1.0, 1.0}
-		roundness		= 1 # 0 = squared
+		roundness		= 0 # 0 = squared
 	}
 }
 
 style "menu_item_white" {
 	xthickness	= 2
-	ythickness	= 3
+	ythickness	= 4
 
 	fg[PRELIGHT]	= @selected_fg_color
 	text[PRELIGHT]	= @selected_fg_color
+
+	engine "murrine" {
+		border_shades = {1.5, 1.5}
+	}
 }
 
 style "menu_item_black" {
 	xthickness	= 2
-	ythickness	= 3
+	ythickness	= 4
 
 	fg[PRELIGHT]	= @text_color
+
+	engine "murrine" {
+		border_shades = {1.5, 1.5}
+	}
 }
 
 style "notebook" { # tab
@@ -773,6 +783,7 @@ style "spinbutton" { # input/stepper
 }
 
 style "toolbar" {
+	GtkWidget::window-dragging	= 1
 	engine "pixmap" {
 		image {
 			function	= BOX
@@ -793,6 +804,10 @@ style "tooltips" {
 	fg[NORMAL]	= @tooltip_fg_color
 
 	GtkWidget::new-tooltip-style	= 0
+
+	engine "murrine" {
+		border_colors	= { "#343434", "#343434" }
+	}
 }
 
 style "treeview" {