Improved combobox design

wesnoth · Jan 21, 2016 · e730308 · e730308
1 parent 5986cc1
commit e730308
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/data/gui/default/widget/combobox_default.cfg b/data/gui/default/widget/combobox_default.cfg
@@ -31,11 +31,12 @@
 					name = "buttons/{BASE_NAME}.png{IPF}"
 				[/image]
 
-				{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+				{GUI__LEFT_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+
 				[image]
-					x = "(width - 12)"
-					y = 7
-					name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
+					x = "(width - 25)"
+					y = 2
+					name = "icons/arrows/short_arrow_left_25.png~ROTATE(-90)"
 				[/image]
 			[/draw]
 
@@ -51,11 +52,12 @@
 					name = "buttons/{BASE_NAME}.png~GS(){IPF}"
 				[/image]
 
-				{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}
+				{GUI__LEFT_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}
+
 				[image]
-					x = "(width - 12)"
-					y = 7
-					name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
+					x = "(width - 25)"
+					y = 2
+					name = "icons/arrows/short_arrow_left_25.png~ROTATE(-90)~GS()"
 				[/image]
 			[/draw]
 
@@ -71,11 +73,12 @@
 					name = "buttons/{BASE_NAME}-pressed.png{IPF}"
 				[/image]
 
-				{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+				{GUI__LEFT_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+
 				[image]
-					x = "(width - 12)"
-					y = 7
-					name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
+					x = "(width - 25)"
+					y = 2
+					name = "icons/arrows/short_arrow_left_25-active.png~ROTATE(-90)"
 				[/image]
 			[/draw]
 
@@ -88,14 +91,16 @@
 				[image]
 					w = "(width)"
 					h = "(height)"
-					name = "buttons/{BASE_NAME}-active.png{IPF}"
+					# Doesn't have its own 'active' variation image
+					name = "buttons/{BASE_NAME}-pressed.png{IPF}"
 				[/image]
 
-				{GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+				{GUI__LEFT_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_ENABLED__TITLE})}
+
 				[image]
-					x = "(width - 12)"
-					y = 7
-					name = "buttons/sliders/slider_arrow_blue.png~ROTATE(180)"
+					x = "(width - 25)"
+					y = 2
+					name = "icons/arrows/short_arrow_left_25-active.png~ROTATE(-90)"
 				[/image]
 			[/draw]
 
@@ -110,8 +115,8 @@
 	description = "Default button"
 
 	# Tiny gui sizes haven't been tested yet so might need some tuning.
-	{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) 20  54 11  6 2 ({GUI_TINY__FONT_SIZE__SMALL})   "button_normal/button_H22" ()}
-	{_GUI_RESOLUTION ()                       40 108 22 13 4 ({GUI_NORMAL__FONT_SIZE__SMALL}) "button_normal/button_H22" ()}
+	{_GUI_RESOLUTION ({GUI_TINY__RESOLUTION}) 20  54 11  6 2 ({GUI_TINY__FONT_SIZE__SMALL})   "button_normal/button_dropdown" ()}
+	{_GUI_RESOLUTION ()                       40 140 30 13 4 ({GUI_NORMAL__FONT_SIZE__SMALL}) "button_normal/button_dropdown" ()}
 
 [/combobox_definition]