diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/theme-config.cpp | 2 | ||||
-rw-r--r-- | gui/themes/modern.ini | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index c9c83c7dbc..3ae353f733 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -260,7 +260,7 @@ const char *Theme::_defaultConfigINI = "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" diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini index a4b6cfe5c4..3b688d679d 100644 --- a/gui/themes/modern.ini +++ b/gui/themes/modern.ini @@ -146,7 +146,7 @@ shadow_right_width=4 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 @@ useWithPrefix=midiControls globaloptions_ # 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 @@ opYoffset=(opYoffset + kLineHeight + 8) # 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 @@ use=scummmain # 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 @@ scummconfig=((w - soWidth) / 2) ((h - opYoffset) / 2) soWidth (opYoffset + 8) ## 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.x=90 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) |