fixing panel for mate also

4 files changed, 68 insertions, 87 deletions

diff --git a/Kogaion-daylight/gtk-2.0/Panel/handle-h1.png b/Kogaion-daylight/gtk-2.0/Panel/handle-h1.png
new file mode 100755
index 0000000..8f6c711
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/handle-h1.png
diff --git a/Kogaion-daylight/gtk-2.0/Panel/handle-v1.png b/Kogaion-daylight/gtk-2.0/Panel/handle-v1.png
new file mode 100755
index 0000000..d465f4f
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Panel/handle-v1.png
diff --git a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
index 4970754..923fa4d 100644
--- a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
@@ -46,23 +46,25 @@ style "pixmap-panel"
 			border		= { 4, 4, 1, 1 }
 			stretch		= TRUE
 		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
+#		image {
+#			function	= BOX
+#			recolorable	= TRUE
+#			state		= INSENSITIVE
+#		}
+
 
-		}
 	}
 }
 
-style "other-panel" = "default" #this is doubled, discard when finished
+style "other-panel" 	# this style is somehow doubled, discard when no longer needed
 {
-	xthickness = 2
+	xthickness = 0
 	ythickness = 0
 
 	fg[NORMAL]		= @bg_color
 	fg[PRELIGHT]	= shade (1.45, @selected_bg_color)
 	fg[ACTIVE]		= @bg_color
+	fg[SELECTED]	= @selected_bg_color
 
 	bg[NORMAL]       	=  shade (0.90, @window_active_color)
 #	bg[ACTIVE]			=  @selected_bg_color
@@ -102,12 +104,21 @@ style "other-panel" = "default" #this is doubled, discard when finished
 			border		= { 4, 4, 1, 1 }
 			stretch		= TRUE
 		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-
-		}
+    	image {
+      		function			= HANDLE
+      		recolorable			= TRUE
+     		overlay_file		= "Others/null.png"
+     		#overlay_file		= "Handles/handle-v.png"
+      		overlay_stretch		= FALSE
+      		orientation			= VERTICAL
+    	}
+    	image {
+      		function			= HANDLE
+     		overlay_file		= "Others/null.png"
+     		#overlay_file		= "Handles/handle-h.png"
+      		overlay_stretch 	= FALSE
+      		orientation			= HORIZONTAL
+    	}
 	}
 }
 
@@ -132,14 +143,25 @@ style "theme-main-menu-text" = "other-panel"
 
 style "theme-panel-handle" 
 {
-	engine "pixmap" {    
-		image {
-			function = HANDLE
-		}    
-		image {
-			function = HANDLE
-		}
-	}
+	engine "pixmap"
+  	{
+    image
+    {
+      function            = HANDLE
+      file                      = "Panel/panel-handle.png"
+      border                    = { 0, 0, 0, 0 }
+      stretch                   = TRUE
+      orientation            = VERTICAL
+    }
+    image
+    {
+      function            = HANDLE
+      file                      = "Panel/panel-handle.png"
+      border                    = { 0, 0, 0, 0 }
+      stretch                   = TRUE
+      orientation            = HORIZONTAL
+    }
+  	}
 }
 
 # XFCE panel theming.
@@ -181,29 +203,4 @@ widget "*.clock-applet-button.*"		style "other-panel"
 widget "*PanelApplet*"				style "other-panel" # check here, why doubled, looks ok for bottom
 
 # Hide ugly handle
-class "PanelAppletFrame" 			style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
+# class "PanelAppletFrame" 			style "theme-panel-handle"
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
index fdb96a7..7ce4e4a 100644
--- a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
@@ -46,23 +46,23 @@ style "pixmap-panel"
 			border		= { 4, 4, 1, 1 }
 			stretch		= TRUE
 		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-
-		}
+#		image {
+#			function	= BOX
+#			recolorable	= TRUE
+#			state		= INSENSITIVE
+#		}
 	}
 }
 
-style "other-panel" = "default" #this is doubled, discard when finished
+style "other-panel" 	# this style is somehow doubled, discard when no longer needed
 {
-	xthickness = 2
+	xthickness = 0
 	ythickness = 0
 
 	fg[NORMAL]		= lighter (@fg_color)
 	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
 	fg[ACTIVE]		= lighter (@fg_color)
+	fg[SELECTED]	= @selected_bg_color
 
 	bg[NORMAL]       	=  shade (1.0, @window_active_color)
 #	bg[ACTIVE]			=  @selected_bg_color
@@ -102,12 +102,21 @@ style "other-panel" = "default" #this is doubled, discard when finished
 			border		= { 4, 4, 1, 1 }
 			stretch		= TRUE
 		}
-		image {
-			function	= BOX
-			recolorable	= TRUE
-			state		= INSENSITIVE
-
-		}
+    	image {
+      		function			= HANDLE
+      		recolorable			= TRUE
+     		overlay_file		= "Others/null.png"
+     		#overlay_file		= "Handles/handle-v.png"
+      		overlay_stretch		= FALSE
+      		orientation			= VERTICAL
+    	}
+    	image {
+      		function			= HANDLE
+     		overlay_file		= "Others/null.png"
+     		#overlay_file		= "Handles/handle-h.png"
+      		overlay_stretch 	= FALSE
+      		orientation			= HORIZONTAL
+    	}
 	}
 }
 
@@ -196,29 +205,4 @@ widget "*.clock-applet-button.*"		style "other-panel"
 widget "*PanelApplet*"				style "other-panel"
 
 # Hide ugly handle
-class "PanelAppletFrame" 			style:highest "theme-panel-handle"
-
-# The following removes the arrows from the panel
-
-style "panel-arrow-remove" {
-engine "pixmap" {
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= UP
-		}
-	image {
-		function	= ARROW
-		recolorable	= TRUE
-		overlay_file	= "Panel/arrow-blank.png"
-		overlay_border	= {2,2,2,2}
-		overlay_stretch	= FALSE
-		arrow_direction	= DOWN
-		}
-	}
-}
-
-widget_class "*PanelToplevel*" style "panel-arrow-remove"
+# class "PanelAppletFrame" 			style:highest "theme-panel-handle"