Implement new grid_listbox widget

wesnoth · Aug 29, 2016 · 82153b1 · 82153b1
1 parent 943c1bd
commit 82153b1
Show file tree

Hide file tree

Showing 7 changed files with 562 additions and 51 deletions.
diff --git a/data/gui/schema.cfg b/data/gui/schema.cfg
@@ -614,6 +614,12 @@
                 max="-1"
                 super="gui/listbox_definition"
             [/tag]
+            [tag]
+                name="grid_listbox_definition"
+                min="0"
+                max="-1"
+                super="gui/listbox_definition"
+            [/tag]
             [tag]
                 name="horizontal_scrollbar_definition"
                 min="0"
@@ -1525,6 +1531,61 @@
                                         default=false
                                     [/key]
                                 [/tag]
+                                [tag]
+                                    name="grid_listbox"
+                                    min="0"
+                                    max="-1"
+                                    super="generic/widget_instance"
+                                    [tag]
+                                        name="footer"
+                                        min="0"
+                                        max="1"
+                                        super="gui/window/resolution/grid"
+                                    [/tag]
+                                    [tag]
+                                        name="header"
+                                        min="0"
+                                        max="1"
+                                        super="gui/window/resolution/grid"
+                                    [/tag]
+                                    [tag]
+                                        name="list_data"
+                                        min="0"
+                                        max="1"
+                                        super="generic/listbox_grid"
+                                    [/tag]
+                                    [tag]
+                                        name="list_definition"
+                                        min="0"
+                                        max="1"
+                                        [tag]
+                                            name="row"
+                                            min="1"
+                                            max="1"
+                                            super="generic/listbox_grid/row"
+                                        [/tag]
+                                    [/tag]
+                                    [key]
+                                        name="horizontal_scrollbar_mode"
+                                        type="scrollbar_mode"
+                                        default=initial_auto
+                                    [/key]
+                                    [key]
+                                        name="vertical_scrollbar_mode"
+                                        type="scrollbar_mode"
+                                        default=initial_auto
+                                    [/key]
+                                    [key]
+                                        name="has_minimum"
+                                        type="bool"
+                                        default=true
+                                    [/key]
+                                    [key]
+                                        name="has_maximum"
+                                        type="bool"
+                                        default=true
+                                    [/key]
+                                [/tag]
                                 [tag]
                                     name="listbox"
                                     min="0"

diff --git a/data/gui/widget/listbox_default.cfg b/data/gui/widget/listbox_default.cfg
@@ -176,5 +176,19 @@
 
 [/horizontal_listbox_definition]
 
+[grid_listbox_definition]
+	id = "default"
+	description = "Default grid listbox."
+
+	{_GUI_RESOLUTION
+		({GUI_NORMAL__RESOLUTION})
+		({GUI_NORMAL__FONT_SIZE__DEFAULT})
+		()
+		({GUI__FONT_COLOR_ENABLED__DEFAULT})
+		({GUI__FONT_COLOR_DISABLED__DEFAULT})
+	}
+
+[/grid_listbox_definition]
+
 #undef _GUI_RESOLUTION
 
diff --git a/src/gui/core/register_widget.hpp b/src/gui/core/register_widget.hpp
@@ -34,7 +34,7 @@
 	namespace                                                                  \
 	{                                                                          \
                                                                                \
-	namespace ns_##type                                                        \
+	namespace ns_##type##id                                                    \
 	{                                                                          \
                                                                                \
 		struct tregister_helper                                                \