0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gui2: Reclaim vertical real estate from some Search boxes

Browse source 
Several dialogs have Search boxes accompanying a central element, with
the boxes taking up a whole row of their own. For both aesthetic and
space allocation purposes it turns out to be more convenient to relocate
these boxes to the top right corner of the dialog to share room with the
dialog's caption.

This only applies to the Campaigns menu, Load Game, Create Unit, and
Recall Unit dialogs. The Recruit Unit dialog, interestingly enough,
already used this approach (an accident?).

Chat Log and the Add-ons Manager *could*, in theory, use this same
change, but they are a bit trickier because of the additional controls
attached to the Search box -- especially so in the Add-ons Manager's
case.

[ci skip]
This commit is contained in:
Iris Morelle 2019-11-04 19:27:44 -03:00
parent b0b2e064d9
commit d53ca602b8
4 changed files with 142 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
data/gui/window/campaign_dialog.cfg
View file

@ -163,16 +163,44 @@
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "title"
[grid]
label = _ "Play a Campaign"
[/label]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
vertical_alignment = "top"
[label]
definition = "title"
label = _ "Play a Campaign"
[/label]
[/column]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "right"
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[/grid]
[/column]
@ -195,23 +223,6 @@
[grid]
[row]
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_grow = true
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[row]
grow_factor = 1

50
data/gui/window/game_load.cfg
View file

@ -274,17 +274,42 @@
grow_factor = 0
[column]
grow_factor = 1
horizontal_grow = true
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
id = "lblTitle"
definition = "title"
[grid]
label = _ "Load Game"
[/label]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
vertical_alignment = "top"
[label]
id = "lblTitle"
definition = "title"
label = _ "Load Game"
[/label]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[text_box]
id = "txtFilter"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[/grid]
[/column]
@ -424,12 +449,7 @@
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "txtFilter"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[spacer][/spacer]
[/column]
[column]

60
data/gui/window/unit_create.cfg
View file

@ -37,15 +37,42 @@
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
horizontal_grow = true
[label]
definition = "title"
label = _ "Create Unit (Debug!)"
[/label]
[grid]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
vertical_alignment = "top"
[label]
definition = "title"
label = _ "Create Unit (Debug!)"
[/label]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[/grid]
[/column]
@ -81,23 +108,6 @@
[grid]
[row]
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
[/text_box]
[/column]
[/row]
[row]
[column]

64
data/gui/window/unit_recall.cfg
View file

@ -279,16 +279,43 @@
grow_factor = 0
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
horizontal_grow = true
[label]
definition = "title"
id = "title"
label = _ "Recall Unit"
[/label]
[grid]
[row]
[column]
grow_factor = 1
border = "all"
border_size = 5
horizontal_alignment = "left"
[label]
definition = "title"
id = "title"
label = _ "Recall Unit"
[/label]
[/column]
[column]
border = "all"
border_size = 5
horizontal_alignment = "right"
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
tooltip = _ "Search for unit name, unit type name, unit level, or trait."
[/text_box]
[/column]
[/row]
[/grid]
[/column]
@ -326,25 +353,6 @@
[grid]
[row]
grow_factor = 0
[column]
border = "all"
border_size = 5
horizontal_alignment = "left"
[text_box]
id = "filter_box"
definition = "default"
{FILTER_TEXT_BOX_HINT}
tooltip = _ "Search for unit name, unit type name, unit level, or trait."
[/text_box]
[/column]
[/row]
[row]
grow_factor = 1