[SCM] calf/master: Buttons with better response, pixel accurate, light border

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a9451c40f4f5314c8853aa84d94c0c2eaa9c3f72
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Fri Nov 13 08:59:42 2009 +0100

    Buttons with better response, pixel accurate, light border

diff --git a/gui/button.png b/gui/button.png
index f244a21..48b0898 100644
Binary files a/gui/button.png and b/gui/button.png differ
diff --git a/gui/button_active.png b/gui/button_active.png
index 32f94fb..1de7f90 100644
Binary files a/gui/button_active.png and b/gui/button_active.png differ
diff --git a/gui/button_default.png b/gui/button_default.png
index f244a21..48b0898 100644
Binary files a/gui/button_default.png and b/gui/button_default.png differ
diff --git a/gui/button_insens.png b/gui/button_insens.png
index 69f747a..ff2b4c2 100644
Binary files a/gui/button_insens.png and b/gui/button_insens.png differ
diff --git a/gui/button_normal.png b/gui/button_normal.png
index 3adfe16..d772214 100644
Binary files a/gui/button_normal.png and b/gui/button_normal.png differ
diff --git a/gui/button_prelight.png b/gui/button_prelight.png
index 2437e32..7c00dad 100644
Binary files a/gui/button_prelight.png and b/gui/button_prelight.png differ
diff --git a/gui/calf.rc b/gui/calf.rc
index 5e93ec9..3529388 100644
--- a/gui/calf.rc
+++ b/gui/calf.rc
@@ -132,8 +132,8 @@ style "clearlooks-button"
 {
 	GtkButton      ::child-displacement-x = 0
 	GtkButton      ::child-displacement-y = 0
-#	GtkButton      ::default-border       = { 6, 24, 5, 5 }
-	GtkButton      ::inner-border         = { 6, 25, 2, 2}
+#	GtkButton      ::default-border       = { 6, 6, 5, 5 }
+	GtkButton      ::inner-border         = { 6, 6, 2, 2}
 	
     xthickness = 5
     ythickness = 2
@@ -157,8 +157,8 @@ style "clearlooks-button"
 			function		= BOX
 			detail			= "buttondefault"
 			recolorable		= FALSE
-			file			= "button_normal.png"
-			border			= {6, 24, 6, 6}
+			file			= "button_default.png"
+			border			= {6, 6, 6, 6}
 			stretch			= TRUE
 		}
 		image
@@ -166,31 +166,31 @@ style "clearlooks-button"
 			function		= BOX
 			state			= PRELIGHT
 			recolorable		= FALSE
-			file			= "button_prelight.png"
-			border			= {6, 24, 6, 6}
+			file			= "button_default_prelight.png"
+			border			= {6, 6, 6, 6}
 			stretch			= TRUE
 		}
 		image
 		{
 			function		= BOX
 			state			= ACTIVE
-			file			= "button_prelight.png"
-			border			= {6, 24, 6, 6}
+			file			= "button_default_active.png"
+			border			= {6, 6, 6, 6}
 			stretch			= TRUE
 		}
 		image
 		{
 			function		= BOX
 			state			= INSENSITIVE
-			file			= "button_insens.png"
-			border			= {6, 24, 6, 6}
+			file			= "button_default.png"
+			border			= {6, 6, 6, 6}
 			stretch			= TRUE
 		}
 		image
 		{
 			function		= BOX
-			file			= "button_normal.png"
-			border			= {6, 24, 6, 6}
+			file			= "button_default.png"
+			border			= {6, 6, 6, 6}
 			stretch			= TRUE
 		}
 		
@@ -200,7 +200,7 @@ style "clearlooks-button-norm"
 {
 	GtkButton      ::child-displacement-x = 0
 	GtkButton      ::child-displacement-y = 0
-#	GtkButton      ::default-border       = { 6, 24, 5, 5 }
+#	GtkButton      ::default-border       = { 6, 6, 5, 5 }
 	GtkButton      ::inner-border         = { 6, 6, 3, 3}
 	
     xthickness = 5
@@ -229,6 +229,22 @@ style "clearlooks-button-norm"
 		}
 		image
 		{
+			function		= BOX
+			state			= PRELIGHT
+			file			= "button_default_prelight.png"
+			border			= {6, 6, 6, 6}
+			stretch			= TRUE
+		}
+		image
+		{
+			function		= BOX
+			state			= ACTIVE
+			file			= "button_default_active.png"
+			border			= {6, 6, 6, 6}
+			stretch			= TRUE
+		}
+		image
+		{
 			function		= VLINE
 			recolorable		= FALSE
 			file			= "vline.png"
@@ -546,7 +562,7 @@ style "clearlooks-combobox"
 			function		= BOX
 			recolorable		= FALSE
 			state			= PRELIGHT
-			file			= "button_default.png"
+			file			= "button_default_prelight.png"
 			border			= {8, 24, 6, 6}
 			stretch			= TRUE
 		}
@@ -565,7 +581,7 @@ style "clearlooks-combobox"
 			function		= BOX
 			recolorable		= FALSE
 			state			= ACTIVE
-			file			= "button_default.png"
+			file			= "button_default_active.png"
 			border			= {8, 24, 6, 6}
 			stretch			= TRUE
 		}
diff --git a/gui/toggle1.png b/gui/toggle1.png
index 3bd297a..5024daf 100644
Binary files a/gui/toggle1.png and b/gui/toggle1.png differ
diff --git a/gui/toggle2.png b/gui/toggle2.png
index 88d631a..91a66d5 100644
Binary files a/gui/toggle2.png and b/gui/toggle2.png differ

-- 
calf audio plugins packaging