More design tweaks to windows and borders

wesnoth · Mar 21, 2016 · 2f8f3af · 2f8f3af
1 parent 596a529
commit 2f8f3af
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 3 deletions.
diff --git a/data/gui/macros/_initial.cfg b/data/gui/macros/_initial.cfg
@@ -93,10 +93,18 @@
 	"64, 64, 64, 64"
 #enddef
 
+#define GUI__BORDER_COLOR_DARK
+	"114, 79, 46, 255"
+#enddef
+
 #define GUI__BORDER_COLOR
 	"162, 127, 68, 255"
 #enddef
 
+#define GUI__BORDER_COLOR_BRIGHT
+	"185, 158, 75, 255"
+#enddef
+
 # Draws the background for a selected cell in a listbox. For now there's one
 # version for both tiny and normal gui.
 #define GUI__LISTBOX_SELECTED_CELL
@@ -108,7 +116,7 @@
 		h = "(height)"
 
 		border_thickness = 1
-		border_color = {GUI__BORDER_COLOR}
+		border_color = {GUI__BORDER_COLOR_BRIGHT}
 
 	[/rectangle]
 

diff --git a/data/gui/widget/combobox_default.cfg b/data/gui/widget/combobox_default.cfg
@@ -11,7 +11,7 @@
 		h = "(height)"
 
 		border_thickness = 1
-		border_color = {GUI__BORDER_COLOR}
+		border_color = {GUI__BORDER_COLOR_DARK}
 
 	[/rectangle]
 #enddef

diff --git a/data/gui/widget/window_default.cfg b/data/gui/widget/window_default.cfg
@@ -145,7 +145,85 @@
 	id = "menu"
 	description = "Window style used for menus"
 
-	{_GUI_RESOLUTION () ("menu") () 2 2 2 2 4 }
+	[resolution]
+
+		{GUI_NORMAL__RESOLUTION}
+
+		left_border = 1
+		right_border = 1
+		top_border = 1
+		bottom_border = 1
+
+		[background]
+
+			[draw]
+
+				[image]
+					x = 0
+					y = 0
+					w = "(width)"
+					h = "(height)"
+					name = "dialogs/menu-background.png"
+					resize_mode = "tile"
+				[/image]
+
+				[rectangle]
+					x = 0
+					y = 0
+					w = "(width)"
+					h = "(height)"
+
+					border_thickness = 1
+					border_color = {GUI__BORDER_COLOR_DARK}
+				[/rectangle]
+
+			[/draw]
+
+		[/background]
+
+		[foreground]
+
+			[draw]
+			[/draw]
+
+		[/foreground]
+
+		[grid]
+
+			[row]
+				grow_factor = 1
+				[column]
+					horizontal_grow = "true"
+					vertical_grow = "true"
+					[scrollbar_panel]
+						vertical_scrollbar_mode = "initial_auto"
+						horizontal_scrollbar_mode = "initial_auto"
+						[definition]
+
+							[row]
+
+								[column]
+									horizontal_grow = "true"
+									vertical_grow = "true"
+									[grid]
+										id = "_window_content_grid"
+									[/grid]
+
+								[/column]
+
+							[/row]
+
+						[/definition]
+
+					[/scrollbar_panel]
+
+				[/column]
+
+			[/row]
+
+		[/grid]
+
+	[/resolution]
 
 [/window_definition]