GUI2: bunch of small internal layout tweaks to dialogs using unit preview panes

These should have littke to no obvious effect, except if one of these dialogs is made fixed-size or
extra space becomes available for some reason.
This commit is contained in:
Charles Dang 2016-11-05 19:51:53 +11:00
parent 6f22fd5ec6
commit da5ca8efce
5 changed files with 49 additions and 36 deletions

View file

@ -68,7 +68,7 @@
[linked_group]
id = "image"
fixed_width = "true"
[/linked_group]
[/linked_group]
[linked_group]
id = "type"
@ -82,7 +82,7 @@
[helptip]
id = "tooltip"
[/helptip]
[grid]
[row]
grow_factor = 0
@ -101,7 +101,7 @@
[/column]
[/row]
[row]
grow_factor = 1
@ -111,6 +111,7 @@
[row]
[column]
grow_factor = 0
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
@ -124,11 +125,12 @@
[/column]
[column]
horizontal_alignment = "right"
grow_factor = 1
horizontal_grow = "true"
vertical_alignment = "top"
border = "all"
border_size = 5
[grid]
[row]
grow_factor=0
@ -193,9 +195,9 @@
[/row]
[/grid]
[/resolution]
[/window]
#undef _GUI_ADVANCE_LIST

View file

@ -61,8 +61,9 @@
[grid]
[row]
[column]
grow_factor = 0
vertical_grow = "true"
border = "all"
border_size = 5
@ -73,9 +74,11 @@
[/unit_preview_pane]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
@ -120,7 +123,7 @@
[/row]
[row]
[column]
grow_factor = 1
border = "all"
@ -204,7 +207,7 @@
[/listbox]
[/column]
[/row]
[row]
@ -256,11 +259,11 @@
[/grid]
[/column]
[/row]
[/grid]
[/column]
[/row]

View file

@ -16,7 +16,7 @@
[image]
id = "unit_status_slowed"
definition = "default"
label = "misc/slowed.png"
label = "misc/slowed.png"
[/image]
[/column]
@ -27,7 +27,7 @@
[image]
id = "unit_status_poisoned"
definition = "default"
label = "misc/poisoned.png"
label = "misc/poisoned.png"
[/image]
[/column]
@ -38,7 +38,7 @@
[image]
id = "unit_status_invisible"
definition = "default"
label = "misc/invisible.png"
label = "misc/invisible.png"
[/image]
[/column]
@ -49,7 +49,7 @@
[image]
id = "unit_status_petrified"
definition = "default"
label = "misc/petrified.png"
label = "misc/petrified.png"
[/image]
[/column]
@ -383,8 +383,9 @@
[row]
grow_factor = 1
[column]
grow_factor = 0
vertical_grow = "true"
border = "all"
border_size = 5

View file

@ -109,7 +109,7 @@
border = "all"
border_size = 5
vertical_alignment = "center"
[image]
id = "unit_image"
linked_group = "image"
@ -119,7 +119,7 @@
[column]
grow_factor = 0
horizontal_grow = "true"
[grid]
[row]
[column]
@ -148,7 +148,7 @@
[image]
id = "gold_icon"
definition = "default"
label = "themes/gold.png"
[/image]
[/column]
@ -306,8 +306,9 @@
[row]
grow_factor = 1
[column]
grow_factor = 0
vertical_grow = "true"
border = "all"
border_size = 5
@ -318,8 +319,10 @@
[/unit_preview_pane]
[/column]
[column]
grow_factor = 1
horizontal_grow = "true"
vertical_grow = "true"
[grid]
@ -385,7 +388,7 @@
[/grid]
[/column]
[/row]
[/grid]

View file

@ -21,7 +21,7 @@
[grid]
[row]
[column]
grow_factor = 1
grow_factor = 0
horizontal_grow = "true"
# Smaller border deliberately
@ -35,9 +35,9 @@
[/column]
[column]
grow_factor = 0
grow_factor = 1
horizontal_grow = "true"
[grid]
[row]
[column]
@ -66,7 +66,7 @@
[image]
id = "gold_icon"
definition = "default"
label = "themes/gold.png"
[/image]
[/column]
@ -116,7 +116,7 @@
[linked_group]
id = "image"
fixed_width = "true"
[/linked_group]
[/linked_group]
[linked_group]
id = "type"
@ -130,7 +130,7 @@
[helptip]
id = "tooltip"
[/helptip]
[grid]
[row]
grow_factor = 0
@ -149,16 +149,19 @@
[/column]
[/row]
[row]
grow_factor = 1
[column]
horizontal_grow = "true"
vertical_grow = "true"
[grid]
[row]
[column]
grow_factor = 0
horizontal_grow = "true"
vertical_grow = "true"
border = "all"
@ -172,7 +175,8 @@
[/column]
[column]
horizontal_alignment = "right"
grow_factor = 1
horizontal_grow = "true"
vertical_alignment = "top"
border = "all"
border_size = 5
@ -233,9 +237,9 @@
[/row]
[/grid]
[/resolution]
[/window]
#undef _GUI_RECRUIT_LIST