From 28ee828a3c3f90d3f26d020fe219e25a6eaf938c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Sat, 5 Mar 2011 22:17:03 +0000 Subject: [PATCH] Adjusted the position and layout of the recruit dialog. --- data/gui/default/widget/image_scaled.cfg | 6 +++++- data/gui/default/window/recruit.cfg | 23 ++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/data/gui/default/widget/image_scaled.cfg b/data/gui/default/widget/image_scaled.cfg index e85f0b87283..88abfde7532 100644 --- a/data/gui/default/widget/image_scaled.cfg +++ b/data/gui/default/widget/image_scaled.cfg @@ -9,6 +9,7 @@ [resolution] + vertical_placement=bottom #min_width = 250 #"{__GUI_IMAGE_DISPLAYED_WIDTH}" #min_height = 250 #"{__GUI_IMAGE_DISPLAYED_HEIGHT}" @@ -28,9 +29,12 @@ [image] w="{__GUI_IMAGE_DISPLAYED_WIDTH}" h="{__GUI_IMAGE_DISPLAYED_HEIGHT}" - vertical_alignment=bottom + vertical_placement=bottom #w=250 #h=250 + #x=(500 - image_original_width) +#50 + y=(500 - image_original_height) name = "(text)" [/image] diff --git a/data/gui/default/window/recruit.cfg b/data/gui/default/window/recruit.cfg index 3ebcaf205a0..bb58408522e 100644 --- a/data/gui/default/window/recruit.cfg +++ b/data/gui/default/window/recruit.cfg @@ -18,15 +18,16 @@ definition= "default" - #automatic_placement= "false" + automatic_placement= "false" #vertical_placement= "center" #horizontal_placement= "right" - maximum_width= 800 - maximum_height= 600 - #width=700 - #height=550 -# x=743 -# y=200 + maximum_width=800 + maximum_height=600 + width=800 + height=600 + #x=50 + x=(gamemap_width - ( 800 - 5) ) + y=200 [grid] @@ -61,14 +62,14 @@ #default_width = 250 #"{__GUI_IMAGE_DISPLAYED_WIDTH}" #default_height = 250 #"{__GUI_IMAGE_DISPLAYED_HEIGHT}" - + vertical_placement=bottom #max_width = 250 #"{__GUI_IMAGE_DISPLAYED_WIDTH}" #max_height = 250 #"{__GUI_IMAGE_DISPLAYED_HEIGHT}" #{GUI_FORCE_WIDGET_MINIMUM_SIZE #{__GUI_IMAGE_DISPLAYED_WIDTH} {__GUI_IMAGE_DISPLAYED_HEIGHT} ( {GUI_FORCE_WIDGET_MINIMUM_SIZE 500 500 ( [image] - vertical_alignment=bottom + vertical_alignment=bottom definition=scaled id=unit_portrait [/image])} @@ -108,6 +109,7 @@ [list_definition] [row] [column] + #horizontal_grow=true horizontal_alignment=right [toggle_panel] @@ -119,6 +121,7 @@ [/image] [/column] [column] + {GUI_FORCE_WIDGET_MINIMUM_SIZE 175 0 ( [grid] [row] [column] @@ -146,6 +149,7 @@ [/column] [/row] [/grid] + ) } [/column] [/row] [/grid] @@ -154,6 +158,7 @@ [/row] [/list_definition] [/listbox] + [/column] [/row] [/grid]