[Scummvm-cvs-logs] SF.net SVN: scummvm: [22516] scummvm/trunk/gui
sev at users.sourceforge.net
sev at users.sourceforge.net
Thu May 18 06:24:02 CEST 2006
Revision: 22516
Author: sev
Date: 2006-05-18 06:22:48 -0700 (Thu, 18 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22516&view=rev
Log Message:
-----------
Fix several GUI layout problems:
- Correct button widths in scumm help dialog
- Fix button widths on path tabs in options dialogs
- Fix scumm options dialog in 320xY mode
- Added space after volume controls in options dialog
Modified Paths:
--------------
scummvm/trunk/gui/theme-config.cpp
scummvm/trunk/gui/themes/modern.ini
Modified: scummvm/trunk/gui/theme-config.cpp
===================================================================
--- scummvm/trunk/gui/theme-config.cpp 2006-05-18 13:18:02 UTC (rev 22515)
+++ scummvm/trunk/gui/theme-config.cpp 2006-05-18 13:22:48 UTC (rev 22516)
@@ -260,7 +260,7 @@
"useWithPrefix=subtitleControls scummconfig_\n"
"opYoffset=(opYoffset + buttonHeight)\n"
"opYoffset=(opYoffset + buttonHeight + 4)\n"
-"soWidth=(8 + 3 * buttonWidth + 4)\n"
+"soWidth=255\n"
"scummconfig_keys=(soWidth - 3 * (buttonWidth + 4) + 6) opYoffset (buttonWidth - 10) buttonHeight\n"
"scummconfig_cancel=(prev.x2 + 4) prev.y (prev.w + 10) prev.h\n"
"scummconfig_ok=(prev.x2 + 4) prev.y prev.w prev.h\n"
Modified: scummvm/trunk/gui/themes/modern.ini
===================================================================
--- scummvm/trunk/gui/themes/modern.ini 2006-05-18 13:18:02 UTC (rev 22515)
+++ scummvm/trunk/gui/themes/modern.ini 2006-05-18 13:22:48 UTC (rev 22516)
@@ -146,7 +146,7 @@
shadow_top_height=2
shadow_bottom_height=4
inactive_dialog_shading=dim
-shading_dim_percent=30
+shading_dim_percent=20
fontfile_normal=helvr12-l1.bdf
cursor_hotspot_x=0
cursor_hotspot_y=0
@@ -244,13 +244,13 @@
# paths tab
yoffset=vBorder
glOff=((buttonHeight - kLineHeight) / 2 + 2)
-globaloptions_savebutton=10 yoffset (buttonWidth + 5) buttonHeight
+globaloptions_savebutton=10 yoffset buttonWidth buttonHeight
globaloptions_savepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
yoffset=(yoffset + buttonHeight + 8)
-globaloptions_extrabutton=10 yoffset (buttonWidth + 5) buttonHeight
+globaloptions_extrabutton=10 yoffset buttonWidth buttonHeight
globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
yoffset=(yoffset + buttonHeight + 12)
-globaloptions_keysbutton=5 yoffset (buttonWidth + 5) buttonHeight
+globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight
globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
@@ -282,13 +282,13 @@
# paths tab
opYoffset=vBorder
goOff=((buttonHeight - kLineHeight) / 2 + 2)
-gameoptions_gamepath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_gamepath=gox opYoffset buttonWidth buttonHeight
gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
opYoffset=(opYoffset + buttonHeight + 8)
-gameoptions_extrapath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_extrapath=gox opYoffset buttonWidth buttonHeight
gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
opYoffset=(opYoffset + buttonHeight + 8)
-gameoptions_savepath=gox opYoffset (buttonWidth + 5) buttonHeight
+gameoptions_savepath=gox opYoffset buttonWidth buttonHeight
gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
opYoffset=(opYoffset + buttonHeight + 8)
@@ -344,6 +344,7 @@
# hence it is on the end of the list
opYoffset=8
useWithPrefix=volumeControls scummconfig_
+opYoffset=(opYoffset + buttonHeight / 2)
useWithPrefix=subtitleControls scummconfig_
opYoffset=(opYoffset + buttonHeight)
opYoffset=(opYoffset + buttonHeight + 4)
@@ -357,6 +358,7 @@
## Help
scummHelpNumLines=15
shH=(5 + (2 + scummHelpNumLines) * kFontHeight + buttonHeight + 7)
+shButtonWidth=(buttonWidth - 20)
scummhelp=scummhelpX ((h - shH) / 2) scummhelpW shH
scummhelp_title=10 5 scummhelpW kFontHeight
scummhelp_title.align=kTextAlignCenter
@@ -368,9 +370,9 @@
scummhelp_dsc.yoffset=5
scummhelp_dsc.w=(scummhelpW - 10 - 90)
scummhelp_dsc.h=kFontHeight
-scummhelp_prev=10 (5 + kFontHeight * (scummHelpNumLines + 2) + 2) buttonWidth buttonHeight
+scummhelp_prev=10 (5 + kFontHeight * (scummHelpNumLines + 2) + 2) shButtonWidth buttonHeight
scummhelp_next=(prev.x2 + 8) prev.y prev.w prev.h
-scummhelp_close=(scummhelpW - 8 - buttonWidth) prev.y prev.w prev.h
+scummhelp_close=(scummhelpW - 8 - shButtonWidth) prev.y prev.w prev.h
# Saveload dialog
scummsaveload=8 8 (w - 2 * 8) (h - 16)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list