tristate buttons for gui2

This commit adds the c++ code to add tristate buttons: toggle_buttons and toggle_panels can now have an arbitrary number of states instead of just 2 (selected and not selected). The number of states is determined by the number of [state] tags in the widgets definition. This doesn't add tristate definitions yet, but the plan is to use tristate buttons later for the headers of sortable lists (No-Sort, Sort-Up, Sort-Down buttons) TODO: figure out whether to remove the parameter from tcontrols constructor.
wesnoth · Aug 7, 2015 · 1359e6a · 1359e6a
1 parent 6cc2c93
commit 1359e6a
Show file tree

Hide file tree

Showing 23 changed files with 290 additions and 278 deletions.
diff --git a/data/gui/default/widget/toggle_button_default.cfg b/data/gui/default/widget/toggle_button_default.cfg
@@ -33,7 +33,8 @@
 		text_extra_width = {EXTRA_WIDTH}
 		text_font_size = {FONT_SIZE}
 
-		[state_enabled]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -45,9 +46,9 @@
 
 			[/draw]
 
-		[/state_enabled]
+		[/enabled]
 
-		[state_disabled]
+		[disabled]
 
 			[draw]
 
@@ -59,9 +60,9 @@
 
 			[/draw]
 
-		[/state_disabled]
+		[/disabled]
 
-		[state_focussed]
+		[focussed]
 
 			[draw]
 
@@ -73,13 +74,15 @@
 
 			[/draw]
 
-		[/state_focussed]
+		[/focussed]
+		[/state]
 
 ###
 ### Selected
 ###
 
-		[state_enabled_selected]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -91,9 +94,9 @@
 
 			[/draw]
 
-		[/state_enabled_selected]
+		[/enabled]
 
-		[state_disabled_selected]
+		[disabled]
 
 			[draw]
 
@@ -105,9 +108,9 @@
 
 			[/draw]
 
-		[/state_disabled_selected]
+		[/disabled]
 
-		[state_focussed_selected]
+		[focussed]
 
 			[draw]
 
@@ -119,7 +122,8 @@
 
 			[/draw]
 
-		[/state_focussed_selected]
+		[/focussed]
+		[/state]
 
 	[/resolution]
 #enddef

diff --git a/data/gui/default/widget/toggle_button_icon.cfg b/data/gui/default/widget/toggle_button_icon.cfg
@@ -32,7 +32,8 @@
 		text_extra_width = 0
 		text_font_size = 0
 
-		[state_enabled]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -48,9 +49,9 @@
 
 			[/draw]
 
-		[/state_enabled]
+		[/enabled]
 
-		[state_disabled]
+		[disabled]
 
 			[draw]
 
@@ -66,9 +67,9 @@
 
 			[/draw]
 
-		[/state_disabled]
+		[/disabled]
 
-		[state_focussed]
+		[focussed]
 
 			[draw]
 
@@ -84,13 +85,15 @@
 
 			[/draw]
 
-		[/state_focussed]
+		[/focussed]
+		[/state]
 
 ###
 ### Selected
 ###
 
-		[state_enabled_selected]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -106,9 +109,9 @@
 
 			[/draw]
 
-		[/state_enabled_selected]
+		[/enabled]
 
-		[state_disabled_selected]
+		[disabled]
 
 			[draw]
 
@@ -124,9 +127,9 @@
 
 			[/draw]
 
-		[/state_disabled_selected]
+		[/disabled]
 
-		[state_focussed_selected]
+		[focussed]
 
 			[draw]
 
@@ -142,7 +145,8 @@
 
 			[/draw]
 
-		[/state_focussed_selected]
+		[/focussed]
+		[/state]
 
 	[/resolution]
 

diff --git a/data/gui/default/widget/toggle_button_listbox_text.cfg b/data/gui/default/widget/toggle_button_listbox_text.cfg
@@ -46,7 +46,8 @@
 		text_extra_width = {EXTRA_WIDTH}
 		text_font_size = {FONT_SIZE}
 
-		[state_enabled]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -55,9 +56,9 @@
 
 			[/draw]
 
-		[/state_enabled]
+		[/enabled]
 
-		[state_disabled]
+		[disabled]
 
 			[draw]
 
@@ -66,9 +67,9 @@
 
 			[/draw]
 
-		[/state_disabled]
+		[/disabled]
 
-		[state_focussed]
+		[focussed]
 
 			[draw]
 
@@ -77,13 +78,15 @@
 
 			[/draw]
 
-		[/state_focussed]
+		[/focussed]
+		[/state]
 
 ###
 ### Selected
 ###
 
-		[state_enabled_selected]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -92,9 +95,9 @@
 
 			[/draw]
 
-		[/state_enabled_selected]
+		[/enabled]
 
-		[state_disabled_selected]
+		[disabled]
 
 			[draw]
 
@@ -103,9 +106,9 @@
 
 			[/draw]
 
-		[/state_disabled_selected]
+		[/disabled]
 
-		[state_focussed_selected]
+		[focussed]
 
 			[draw]
 
@@ -114,7 +117,8 @@
 
 			[/draw]
 
-		[/state_focussed_selected]
+		[/focussed]
+		[/state]
 
 	[/resolution]
 #enddef

diff --git a/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg b/data/gui/default/widget/toggle_button_listbox_text_with_icon.cfg
@@ -53,7 +53,8 @@
 		text_extra_width = {EXTRA_WIDTH}
 		text_font_size = {FONT_SIZE}
 
-		[state_enabled]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -63,9 +64,9 @@
 
 			[/draw]
 
-		[/state_enabled]
+		[/enabled]
 
-		[state_disabled]
+		[disabled]
 
 			[draw]
 
@@ -75,9 +76,9 @@
 
 			[/draw]
 
-		[/state_disabled]
+		[/disabled]
 
-		[state_focussed]
+		[focussed]
 
 			[draw]
 
@@ -87,13 +88,15 @@
 
 			[/draw]
 
-		[/state_focussed]
+		[/focussed]
+		[/state]
 
 ###
 ### Selected
 ###
 
-		[state_enabled_selected]
+		[state]
+		[enabled]
 
 			[draw]
 
@@ -103,9 +106,9 @@
 
 			[/draw]
 
-		[/state_enabled_selected]
+		[/enabled]
 
-		[state_disabled_selected]
+		[disabled]
 
 			[draw]
 
@@ -115,9 +118,9 @@
 
 			[/draw]
 
-		[/state_disabled_selected]
+		[/disabled]
 
-		[state_focussed_selected]
+		[focussed]
 
 			[draw]
 
@@ -127,7 +130,8 @@
 
 			[/draw]
 
-		[/state_focussed_selected]
+		[/focussed]
+		[/state]
 
 	[/resolution]