Started to prepare the gui for runtime resolution switches.

(some little things could be missing yet though)

svn-id: r22017

1 files changed, 30 insertions, 4 deletions

diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 456eada976..84e08b9fd9 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -148,6 +148,7 @@ shading_dim_percent=30
 fontfile_normal=helvr12-l1.bdf
 
 [640xY]
+def_launcherX=23
 def_widgetSize=kBigWidgetSize
 def_buttonWidth=120
 def_buttonHeight=25
@@ -155,7 +156,7 @@ def_sliderWidth=kBigSliderWidth
 def_sliderHeight=kBigSliderHeight
 def_kLineHeight=16
 def_kFontHeight=14
-def_globOptionsW=466
+def_globOptionsW=(w - buttonWidth - 17 * 2 - launcherX)
 def_gameOptionsH=(h - 2 * 40)
 def_gameOptionsLabelWidth=90
 def_tabPopupsLabelW=110
@@ -197,13 +198,13 @@ browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8)
 browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
 
 ##### launcher
-launcher_version=85 21 247 kLineHeight
+launcher_version=(w / 2 - 283 / 2 - 90) 21 247 kLineHeight
 launcher_version.align=kTextAlignRight
-launcher_logo=180 5 283 80
+launcher_logo=(w / 2 - 283 / 2) 5 283 80
 launcher_logo.visible=true
 space1=20
 space2=5
-launcher_list=23 94 466 (h - 23 - self.y)
+launcher_list=launcherX 94 (w - buttonWidth - 17 * 2 - self.x) (h - 23 - self.y)
 launcher_start_button=(prev.x2 + 17) prev.y buttonWidth buttonHeight
 launcher_addGame_button=prev.x (prev.y2 + space1) prev.w prev.h
 launcher_editGame_button=prev.x (prev.y2 + space2) prev.w prev.h
@@ -461,3 +462,28 @@ scummmain_quit=prev.x smY prev.w prev.h
 smH=(smY + buttonHeight + scummmainHOffset)
 smW=(buttonWidth + 2 * scummmainHOffset)
 scummmain=((w - smW) / 2) ((h - smH) / 2) smW smH
+
+## 960xY modes
+[960xY]
+def_launcherX=23
+def_widgetSize=kBigWidgetSize
+def_buttonWidth=120
+def_buttonHeight=25
+def_sliderWidth=kBigSliderWidth
+def_sliderHeight=kBigSliderHeight
+def_kLineHeight=16
+def_kFontHeight=14
+def_globOptionsW=(w - buttonWidth - 17 * 2 - launcherX)
+def_gameOptionsH=(h - 2 * 40)
+def_gameOptionsLabelWidth=90
+def_tabPopupsLabelW=110
+def_aboutXOff=8
+def_aboutYOff=5
+def_aboutOuterBorder=80
+def_scummmainHOffset=12
+def_scummmainVSpace=15
+def_scummmainVAddOff=5
+def_scummhelpW=370
+def_scummhelpX=((w - scummhelpW) / 2)
+def_midiControlsSpacing=4
+use=640xY