Author: fendrin
Date: Sat Mar  5 23:17:03 2011
New Revision: 48771

URL: http://svn.gna.org/viewcvs/wesnoth?rev=48771&view=rev
Log:
Adjusted the position and layout of the recruit dialog.

Modified:
    trunk/data/gui/default/widget/image_scaled.cfg
    trunk/data/gui/default/window/recruit.cfg

Modified: trunk/data/gui/default/widget/image_scaled.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/widget/image_scaled.cfg?rev=48771&r1=48770&r2=48771&view=diff
==============================================================================
--- trunk/data/gui/default/widget/image_scaled.cfg (original)
+++ trunk/data/gui/default/widget/image_scaled.cfg Sat Mar  5 23:17:03 2011
@@ -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]
 

Modified: trunk/data/gui/default/window/recruit.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/recruit.cfg?rev=48771&r1=48770&r2=48771&view=diff
==============================================================================
--- trunk/data/gui/default/window/recruit.cfg (original)
+++ trunk/data/gui/default/window/recruit.cfg Sat Mar  5 23:17:03 2011
@@ -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]


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to