gui2/addon_manager: Move Search to the top right on small resolutions

wesnoth · Oct 26, 2021 · 2643671 · 2643671
1 parent 4503c99
commit 2643671
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 26 deletions.
diff --git a/changelog.md b/changelog.md
@@ -12,9 +12,10 @@
  ### Translations
  ### Units
  ### User interface
+   * Made the Add-ons Manager search box less unwieldy on very small resolutions.
  ### WML Engine
  ### Miscellaneous and Bug Fixes
- 
+
 ## Version 1.16.0
  ### Campaigns
    * Sceptre of Fire

diff --git a/data/gui/window/addon_manager.cfg b/data/gui/window/addon_manager.cfg
@@ -706,26 +706,23 @@
 	[/grid]
 #enddef
 
-#define _GUI_ADDON_FILTER_OPTIONS
+#define _GUI_ADDON_FILTER_BOX
+	[text_box]
+		id = "filter"
+		definition = "default"
+
+		tooltip = _ "Filters on addon description, version, type or author"
+		{FILTER_TEXT_BOX_HINT}
+	[/text_box]
+#enddef
+
+#define _GUI_ADDON_FILTER_OPTIONS _FILTER_BOX
 	[grid]
 
 		[row]
 			grow_factor = 1
 
-			[column]
-				grow_factor = 0
-				border = "all"
-				border_size = 5
-				horizontal_alignment = "left"
-
-				[text_box]
-					id = "filter"
-					definition = "default"
-
-					tooltip = _ "Filters on addon description, version, type or author"
-					{FILTER_TEXT_BOX_HINT}
-				[/text_box]
-			[/column]
+			{_FILTER_BOX}
 
 			[column]
 				grow_factor = 0
@@ -892,17 +889,30 @@
 				grow_factor = 0
 
 				[column]
-					grow_factor = 1
+					horizontal_grow = true
 
-					border = "all"
-					border_size = 5
-					horizontal_alignment = "left"
-					[label]
-						definition = "title"
+					[grid]
+						[row]
+							[column]
+								border = "all"
+								border_size = 5
+								horizontal_alignment = "left"
+								[label]
+									definition = "title"
 
-						label = _ "Add-ons Manager"
-					[/label]
+									label = _ "Add-ons Manager"
+								[/label]
+							[/column]
+
+							[column]
+								border = "all"
+								border_size = 5
+								horizontal_alignment = "right"
 
+								{_GUI_ADDON_FILTER_BOX}
+							[/column]
+						[/row]
+					[/grid]
 				[/column]
 
 			[/row]
@@ -929,7 +939,7 @@
 									horizontal_grow = true
 									vertical_grow = true
 
-									{_GUI_ADDON_FILTER_OPTIONS}
+									{_GUI_ADDON_FILTER_OPTIONS ()}
 
 								[/column]
 
@@ -1100,7 +1110,15 @@
 					#border = "top"
 					#border_size = 5
 
-					{_GUI_ADDON_FILTER_OPTIONS}
+					{_GUI_ADDON_FILTER_OPTIONS (
+						[column]
+							grow_factor = 0
+							border = "all"
+							border_size = 5
+							horizontal_alignment = "left"
+							{_GUI_ADDON_FILTER_BOX}
+						[/column]
+					)}
 
 				[/column]
 
@@ -1225,6 +1243,7 @@
 
 [/window]
 
+#undef _GUI_ADDON_FILTER_BOX
 #undef _GUI_ADDON_FILTER_OPTIONS
 #undef _GUI_ADDON_DETAILS_SECTION
 #undef _GUI_SERVER_CONN_INFO:TOOLTIP_TLS