X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=basic.skin;h=5f9f0b10d7614ce326fc715c72669f9e9b79bb05;hb=HEAD;hp=eb0a9d6802c01a17ca40e46cb266288e736edf27;hpb=787dd5572e904a87686e7309401b86e0c528d823;p=libs%2Fgltk.git

diff --git a/basic.skin b/basic.skin
index eb0a9d6..5f9f0b1 100644
--- a/basic.skin
+++ b/basic.skin
@@ -1,32 +1,43 @@
-/* $Id$ */
-
-default_font "dejavu-10.font";
+default_font "dejavu-16.font";
 
 graphic "grey_raised"
 {
 	texture "basic_skin.png";
 	slice 0 52 12 12;
-	border { left 3; right 3; top 3; bottom 3; };
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "light_grey_raised"
 {
 	texture "basic_skin.png";
 	slice 0 39 12 12;
-	border { left 3; right 3; top 3; bottom 3; };
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "dark_grey_sunken"
 {
 	texture "basic_skin.png";
-	slice 14 52 12 12;
-	border { left 3; right 3; top 3; bottom 3; };
+	slice 13 52 12 12;
+	border { vertical 3; horizontal 3; };
+};
+
+graphic "blue_border"
+{
+	texture "basic_skin.png";
+	slice 13 0 12 12;
+	border { vertical 2; horizontal 2; };
+	shadow { vertical 1; horizontal 1; };
 };
 
 style "button"
 {
 	font_color 0.0 0.0 0.0;
 
+	part
+	{
+		graphic FOCUS "blue_border";
+	};
+
 	part
 	{
 		graphic NORMAL "grey_raised";
@@ -38,7 +49,7 @@ style "button"
 	{
 		align 0.5 0.5;
 		fill 0.0 0.0;
-		margin { left 3; right 3; top 3; bottom 3; };
+		margin { vertical 4; horizontal 6; };
 	};
 };
 
@@ -46,7 +57,7 @@ graphic "white_sunken"
 {
 	texture "basic_skin.png";
 	slice 0 26 12 12;
-	border { left 3; right 3; top 3; bottom 3; };
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "check_tick"
@@ -70,6 +81,14 @@ style "toggle"
 		graphic HOVER "light_grey_flat";
 	};
 
+	part
+	{
+		graphic FOCUS "blue_border";
+		align 0.0 0.5;
+		fill 0.0 0.0;
+		size 12 12;
+	};
+
 	part
 	{
 		graphic NORMAL "white_sunken";
@@ -89,7 +108,7 @@ style "toggle"
 	{
 		align 0.0 0.5;
 		fill 0.0 0.0;
-		margin { left 14; };
+		margin { left 15; };
 	};
 };
 
@@ -102,7 +121,14 @@ graphic "white_circle_sunken"
 graphic "option_dot"
 {
 	texture "basic_skin.png";
-	slice 37 58 6 6;
+	slice 29 49 6 6;
+};
+
+graphic "blue_round_border"
+{
+	texture "basic_skin.png";
+	slice 49 0 14 14;
+	shadow { vertical 1; horizontal 1; };
 };
 
 style "toggle-option"
@@ -114,6 +140,13 @@ style "toggle-option"
 		graphic HOVER "light_grey_flat";
 	};
 
+	part
+	{
+		graphic FOCUS "blue_round_border";
+		align 0.0 0.5;
+		fill 0.0 0.0;
+	};
+
 	part
 	{
 		graphic NORMAL "white_circle_sunken";
@@ -133,7 +166,7 @@ style "toggle-option"
 	{
 		align 0.0 0.5;
 		fill 0.0 0.0;
-		margin { left 14; };
+		margin { left 15; };
 	};
 };
 
@@ -152,6 +185,7 @@ graphic "entry_cursor"
 {
 	texture "basic_skin.png";
 	slice 26 56 1 8;
+	shadow { vertical 1; };
 };
 
 style "entry"
@@ -165,17 +199,15 @@ style "entry"
 
 	part "text"
 	{
-		align 0.0 0.5;
+		align 0.0 1.0;
 		fill 0.0 0.0;
-		margin { left 3; right 3; top 3; bottom 3; };
+		margin { horizontal 6; vertical 4; };
 	};
 
 	part "cursor"
 	{
 		graphic FOCUS "entry_cursor";
-		align 0.0 0.0;
-		fill 0.0 1.0;
-		margin { left 3; right 3; top 3; bottom 3; };
+		size 1 12;
 	};
 };
 
@@ -183,21 +215,21 @@ graphic "dark_grey_sunken_shallow"
 {
 	texture "basic_skin.png";
 	slice 13 39 12 12;
-	border { left 3; right 3; top 3; bottom 3; };
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "hthumb"
 {
 	texture "basic_skin.png";
-	slice 26 45 20 10;
-	border { left 3; right 3; top 3; bottom 3; };
+	slice 26 13 22 12;
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "hthumb_light"
 {
 	texture "basic_skin.png";
-	slice 26 34 20 10;
-	border { left 3; right 3; top 3; bottom 3; };
+	slice 26 0 22 12;
+	border { vertical 3; horizontal 3; };
 };
 
 style "hslider"
@@ -212,22 +244,22 @@ style "hslider"
 		graphic NORMAL "hthumb";
 		graphic HOVER "hthumb_light";
 		fill 0.0 1.0;
-		margin { left 1; right 1; top 1; bottom 1; };
+		margin { horizontal 1; vertical 1; };
 	};
 };
 
 graphic "vthumb"
 {
 	texture "basic_skin.png";
-	slice 26 13 10 20;
-	border { left 3; right 3; top 3; bottom 3; };
+	slice 26 26 12 22;
+	border { vertical 3; horizontal 3; };
 };
 
 graphic "vthumb_light"
 {
 	texture "basic_skin.png";
-	slice 37 13 10 20;
-	border { left 3; right 3; top 3; bottom 3; };
+	slice 39 26 12 22;
+	border { vertical 3; horizontal 3; };
 };
 
 style "vslider"
@@ -242,7 +274,7 @@ style "vslider"
 		graphic NORMAL "vthumb";
 		graphic HOVER "vthumb_light";
 		fill 1.0 0.0;
-		margin { left 1; right 1; top 1; bottom 1; };
+		margin { horizontal 1; vertical 1; };
 	};
 };
 
@@ -259,53 +291,57 @@ style "list"
 	part
 	{
 		graphic NORMAL "white_sunken";
-		margin { right 12; };
+		margin { right 14; };
 	};
 
 	part "slider"
 	{
-		size 12 12;
+		size 14 14;
 		fill 0.0 1.0;
 		align 1.0 0.5;
-		//margin { right 1; top 1; bottom 1; };
-	};
-
-	part "selection"
-	{
-		graphic NORMAL "blue_flat";
-		margin { left 3; right 14; top 3; bottom 3; };
 	};
 
 	part "items"
 	{
-		margin { left 3; right 14; top 3; bottom 3; };
+		margin { left 3; right 17; vertical 3; };
 	};
 };
 
-graphic "grey_raised_divided"
+style "listitem"
 {
-	texture "basic_skin.png";
-	slice 13 0 20 12;
-	border { left 3; right 15; top 5; bottom 5; };
+	part
+	{
+		graphic FOCUS "blue_border";
+	};
+
+	part
+	{
+		graphic ACTIVE "blue_flat";
+	};
+
+	part "children"
+	{
+		margin { horizontal 4; vertical 2; };
+	};
 };
 
-graphic "light_grey_raised_divided"
+graphic "gray_vertical_divider"
 {
 	texture "basic_skin.png";
-	slice 34 0 20 12;
-	border { left 3; right 15; top 5; bottom 5; };
+	slice 26 49 2 6;
+	border { vertical 2; };
 };
 
 graphic "arrow_down"
 {
 	texture "basic_skin.png";
-	slice 44 56 8 8;
+	slice 48 54 10 10;
 };
 
 graphic "arrow_left"
 {
 	texture "basic_skin.png";
-	slice 53 56 8 8;
+	slice 37 54 10 10;
 };
 
 style "dropdown"
@@ -314,8 +350,22 @@ style "dropdown"
 
 	part
 	{
-		graphic NORMAL "grey_raised_divided";
-		graphic HOVER "light_grey_raised_divided";
+		graphic FOCUS "blue_border";
+		graphic ACTIVE "";
+	};
+
+	part
+	{
+		graphic NORMAL "grey_raised";
+		graphic HOVER "light_grey_raised";
+	};
+
+	part
+	{
+		graphic NORMAL "gray_vertical_divider";
+		fill 0.0 1.0;
+		align 1.0 0.5;
+		margin { right 16; vertical 3; };
 	};
 
 	part
@@ -324,14 +374,14 @@ style "dropdown"
 		graphic ACTIVE "arrow_down";
 		fill 0.0 0.0;
 		align 1.0 0.5;
-		margin { right 3; };
+		margin { right 4; };
 	};
 
 	part "text"
 	{
 		fill 0.0 0.0;
 		align 0.0 0.5;
-		margin { left 4; };
+		margin { left 6; right 22; vertical 4; };
 	};
 
 	part "list";
@@ -341,7 +391,7 @@ graphic "grey_beveled"
 {
 	texture "basic_skin.png";
 	slice 0 13 12 12;
-	border { left 4; right 4; top 4; bottom 4; };
+	border { horizontal 4; vertical 4; };
 };
 
 style "panel"
@@ -354,6 +404,16 @@ style "panel"
 	part "children";
 };
 
+style "dialog"
+{
+	part
+	{
+		graphic NORMAL "grey_beveled";
+	};
+
+	part "children";
+};
+
 style "root"
 {
 	part "children";