Patches #1743201: "GUI: Reworked modern theme"

svn-id: r27744

2 files changed, 123 insertions, 123 deletions

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index a32f3b305b..1b36ccff76 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -148,7 +148,7 @@ protected:
 EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 	: OptionsDialog(domain, "gameoptions") {
 
-	int labelWidth = g_gui.evaluator()->getVar("gameOptionsLabelWidth");
+	int labelWidth = g_gui.evaluator()->getVar("tabPopupsLabelW");
 
 	// GAME: Path to game data (r/o), extra data (r/o), and save data (r/w)
 	String gamePath(ConfMan.get("path", _domain));
@@ -270,7 +270,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
 void EditGameDialog::reflowLayout() {
 	OptionsDialog::reflowLayout();
 
-	int labelWidth = g_gui.evaluator()->getVar("gameOptionsLabelWidth");
+	int labelWidth = g_gui.evaluator()->getVar("tabPopupsLabelW");
 
 	if (_langPopUp)
 		_langPopUp->changeLabelWidth(labelWidth);
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index ba928e0932..541c2fb00a 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -185,9 +185,9 @@ def_insetY=94
 def_insetW=(w - buttonWidth - 17 * 2 - insetX)
 def_insetH=(h - 23 - insetY)
 def_optionsVPad=20
-def_gameOptionsLabelWidth=90
+def_optionsLabelWidth=110
 def_gameOptionsOverrideVPad=20
-def_tabPopupsLabelW=110
+def_tabPopupsLabelW=optionsLabelWidth
 def_aboutXOff=8
 def_aboutYOff=5
 def_aboutOuterBorder=80
@@ -196,10 +196,13 @@ def_scummmainVSpace=15
 def_scummmainVAddOff=5
 def_scummhelpW=370
 def_scummhelpX=((w - scummhelpW) / 2)
-def_midiControlsSpacing=4
 def_launcherVersionX=(w / 2 - 283 / 2 - 90)
 def_launcherVersionY=21
 
+def_xSeparation=10
+def_ySeparation=10
+def_xBorder=15
+
 use=pixmaps
 use=colors
 use=gradients
@@ -214,7 +217,7 @@ ListWidget.hlLeftPadding=0
 ListWidget.hlRightPadding=0
 PopUpWidget.leftPadding=7
 PopUpWidget.rightPadding=5
-PopUpWidget.labelSpacing=3
+PopUpWidget.labelSpacing=xSeparation
 EditTextWidget.font=kFontStyleNormal
 EditTextWidget.leftPadding=7
 EditTextWidget.rightPadding=5
@@ -245,7 +248,7 @@ launcher_logo=(w / 2 - 283 / 2) 5 283 80
 launcher_logo.visible=true
 space1=20
 space2=5
-launcher_list=insetX insetY (w - buttonWidth - 17 * 2 - self.x) (h - 23 - self.y)
+launcher_list=insetX insetY insetW insetH
 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
@@ -260,7 +263,7 @@ use=scummmain
 globaloptions=insetX insetY insetW insetH
 set_parent=globaloptions
 vBorder=optionsVPad
-globaloptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 16)
+globaloptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - ySeparation)
 
 # graphics tab
 opYoffset=vBorder
@@ -283,93 +286,94 @@ useWithPrefix=midiControls globaloptions_
 # paths tab
 yoffset=vBorder
 glOff=((buttonHeight - kLineHeight) / 2 + 2)
-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 buttonHeight
-globaloptions_extrapath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
-yoffset=(yoffset + buttonHeight + 8)
-globaloptions_themebutton=10 yoffset buttonWidth buttonHeight
-globaloptions_themepath=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
-yoffset=(yoffset + buttonHeight + 12)
-globaloptions_keysbutton=5 yoffset buttonWidth buttonHeight
+globaloptions_savebutton=xBorder yoffset buttonWidth buttonHeight
+globaloptions_savepath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
+yoffset=(yoffset + buttonHeight + ySeparation)
+globaloptions_extrabutton=xBorder yoffset buttonWidth buttonHeight
+globaloptions_extrapath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
+yoffset=(yoffset + buttonHeight + ySeparation)
+globaloptions_themebutton=xBorder yoffset buttonWidth buttonHeight
+globaloptions_themepath=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
+yoffset=(yoffset + buttonHeight + ySeparation)
+globaloptions_keysbutton=xBorder yoffset buttonWidth buttonHeight
 
 # Misc options
 yoffset=vBorder
 glOff=((buttonHeight - kLineHeight) / 2 + 2)
-globaloptions_themebutton2=10 yoffset buttonWidth buttonHeight
-globaloptions_curtheme=(prev.x2 + 20) (yoffset + glOff) (parent.w - (prev.w + 20) - 10) kLineHeight
-yoffset=(yoffset + buttonHeight + 12)
-globaloptions_autosaveperiod=10 yoffset (parent.w - 10 - 25) kPopUpHeight
+globaloptions_themebutton2=xBorder yoffset buttonWidth buttonHeight
+globaloptions_curtheme=(prev.x2 + xSeparation) (yoffset + glOff) (parent.w - self.x - xBorder) kLineHeight
+yoffset=(yoffset + buttonHeight + ySeparation)
+globaloptions_autosaveperiod=xBorder yoffset (parent.w - self.x - xBorder) kPopUpHeight
 
-globaloptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-globaloptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
+globaloptions_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+globaloptions_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
 
 ### game options
 gameoptions=insetX insetY insetW insetH
 set_parent=gameoptions
 vBorder=gameOptionsOverrideVPad
-gox=10
-gow=(parent.w - gox - 25)
+gox=xBorder
+gow=(parent.w - gox - xBorder)
 
-gameoptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 16)
+gameoptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - ySeparation)
 
 # game tab
 opYoffset=optionsVPad
-gameoptions_id=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
+glOff=((kPopUpHeight - kLineHeight) / 2 + 2)
+gameoptions_id=gox (opYoffset + glOff) optionsLabelWidth kLineHeight
 gameoptions_id.align=kTextAlignRight
-gameoptions_domain=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
-opYoffset=(opYoffset + kLineHeight + 12)
-gameoptions_name=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
+gameoptions_domain=(prev.x2 + xSeparation) opYoffset (parent.w - self.x - xBorder) kPopUpHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+gameoptions_name=gox (opYoffset + glOff) optionsLabelWidth kLineHeight
 gameoptions_name.align=kTextAlignRight
-gameoptions_desc=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
-opYoffset=(opYoffset + kLineHeight + 15)
-gameoptions_lang=gox (opYoffset - 1) gow kPopUpHeight
-opYoffset=(opYoffset + kLineHeight + 12)
+gameoptions_desc=(prev.x2 + xSeparation) opYoffset (parent.w - self.x - xBorder) kPopUpHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+gameoptions_lang=gox opYoffset (parent.w - self.x - xBorder) kPopUpHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
 gameoptions_platform=prev.x opYoffset prev.w prev.h
-opYoffset=(opYoffset + kLineHeight + 8)
+opYoffset=(opYoffset + prev.h + ySeparation)
 
 # paths tab
 opYoffset=optionsVPad
 goOff=((buttonHeight - kLineHeight) / 2 + 2)
 gameoptions_savepath=gox opYoffset buttonWidth buttonHeight
-gameoptions_savepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
-opYoffset=(opYoffset + buttonHeight + 8)
+gameoptions_savepathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
+opYoffset=(opYoffset + buttonHeight + ySeparation)
 gameoptions_extrapath=gox opYoffset buttonWidth buttonHeight
-gameoptions_extrapathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
-opYoffset=(opYoffset + buttonHeight + 8)
+gameoptions_extrapathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
+opYoffset=(opYoffset + buttonHeight + ySeparation)
 gameoptions_gamepath=gox opYoffset buttonWidth buttonHeight
-gameoptions_gamepathText=(prev.x2 + 20) (opYoffset + goOff) (parent.w - self.x - 10) kLineHeight
-opYoffset=(opYoffset + buttonHeight + 8)
+gameoptions_gamepathText=(prev.x2 + xSeparation) (opYoffset + goOff) (parent.w - self.x - xBorder) kLineHeight
+opYoffset=(opYoffset + buttonHeight + ySeparation)
 
 # graphics tab
 opYoffset=vBorder
 opXoffset=gox
-gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
+gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
+opYoffset=(prev.y2 + ySeparation)
 useWithPrefix=graphicsControls gameoptions_
 
 # audio tab
 opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
+gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
+opYoffset=(prev.y2 + ySeparation)
 useWithPrefix=audioControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
 # volume tab
 opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
+gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
+opYoffset=(prev.y2 + ySeparation)
 useWithPrefix=volumeControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
-gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
+gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - xBorder) buttonHeight
+opYoffset=(prev.y2 + ySeparation)
 useWithPrefix=midiControls gameoptions_
 
-gameoptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-gameoptions_ok=(prev.x2 + 10) prev.y prev.w prev.h
+gameoptions_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+gameoptions_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
 
 ### keys dialog
 keysdialog=(w / 20) (h / 10) (w - w / 10) (h - h / 5)
@@ -386,14 +390,14 @@ keysdialog_mapping.align=kTextAlignCenter
 ### mass add dialog
 massadddialog=10 20 300 174
 set_parent=massadddialog
-massadddialog_caption=10 (10 + 1 * kLineHeight) (parent.w - 2*10) kLineHeight
+massadddialog_caption=xBorder (10 + 1 * kLineHeight) (parent.w - 2 * xBorder) kLineHeight
 massadddialog_caption.align=kTextAlignCenter
-massadddialog_dirprogress=10 (10 + 3 * kLineHeight) prev.w prev.h
+massadddialog_dirprogress=xBorder (10 + 3 * kLineHeight) prev.w prev.h
 massadddialog_dirprogress.align=kTextAlignCenter
-massadddialog_gameprogress=10 (10 + 4 * kLineHeight) prev.w prev.h
+massadddialog_gameprogress=xBorder (10 + 4 * kLineHeight) prev.w prev.h
 massadddialog_gameprogress.align=kTextAlignCenter
-massadddialog_ok=((parent.w - (buttonWidth * 2)) / 2) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-massadddialog_cancel=(prev.x2 + 10) prev.y prev.w prev.h
+massadddialog_ok=((parent.w - (buttonWidth * 2) - xSeparation) / 2) (parent.h - buttonHeight - ySeparation) buttonWidth buttonHeight
+massadddialog_cancel=(prev.x2 + xSeparation) prev.y prev.w prev.h
 
 
 ##### SCUMM dialogs
@@ -455,96 +459,93 @@ scummsaveload_extinfo.visible=true
 [chooser]
 chooserW=insetW
 chooser=insetX insetY chooserW opHeight
-chooser_headline=10 6 (chooserW - 2 * 10) (kLineHeight)
-chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight - 12)
-chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
-chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
+chooser_headline=xBorder 6 (chooserW - 2 * xBorder) kLineHeight
+chooser_list=prev.x (prev.y2 + 2) prev.w (opHeight - self.y - buttonHeight - 12)
+#JVPRAT: next Y doesn't seem right
+chooser_cancel=(chooserW - 2 * buttonWidth - xSeparation - xBorder) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
+chooser_ok=(prev.x2 + xSeparation) prev.y prev.w prev.h
 
 [browser]
 browser=insetX insetY insetW insetH
 set_parent=browser
-browser_headline=10 5 (parent.w - 2 * 10) kLineHeight
+browser_headline=xBorder 5 (parent.w - 2 * xBorder) kLineHeight
 browser_headline.align=kTextAlignCenter
-browser_path=10 (prev.y2 + 5) prev.w prev.h
-browser_list=10 prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
-browser_up=10 (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
+browser_path=prev.x (prev.y2 + 5) prev.w prev.h
+browser_list=prev.x prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
+browser_up=prev.x (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+#JVPRAT: doesn't it lack insetx?:
+browser_cancel=(parent.w - 2 * buttonWidth - xSeparation - xBorder) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+browser_choose=(prev.x2 + xSeparation) prev.y prev.w prev.h
 
 [graphicsControls]
-gcx=(opXoffset + 10)
-gcw=(parent.w - gcx - 25)
-grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) kPopUpHeight
-opYoffset=(opYoffset + kLineHeight + 12)
+gcx=(opXoffset + xBorder)
+grModePopup=gcx opYoffset (parent.w - self.x - xBorder) kPopUpHeight
+opYoffset=(prev.y2 + ySeparation)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
-opYoffset=(opYoffset + kLineHeight + 16)
-grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 4)
+opYoffset=(prev.y2 + ySeparation)
+grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - xBorder) kLineHeight
+opYoffset=(prev.y2 + ySeparation)
 grAspectCheckbox=prev.x opYoffset prev.w prev.h
-opYoffset=(opYoffset + buttonHeight + 4)
+opYoffset=(prev.y2 + ySeparation)
 
 [audioControls]
-aux=(opXoffset + 10)
-auw=(parent.w - aux - 30)
-auMidiPopup=(aux) (opYoffset - 1) (auw + 5) kPopUpHeight
-opYoffset=(opYoffset + buttonHeight + 4)
-auSampleRatePopup=(aux) (opYoffset - 1) (auw + 5) kPopUpHeight
-opYoffset=(opYoffset + buttonHeight + 4)
+aux=(opXoffset + xBorder)
+auMidiPopup=aux opYoffset (parent.w - self.x - xBorder) kPopUpHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+auSampleRatePopup=aux (opYoffset - 1) prev.w kPopUpHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
 
 [volumeControls]
-vctextw=110
-vcxoff=(opXoffset + vctextw + 10)
-vcx=(opXoffset + 10)
-vcMusicText=vcx (opYoffset + 2) vctextw kLineHeight
+vcx=(opXoffset + xBorder)
+vcOff=((sliderHeight - kLineHeight) / 2 + 2)
+vcMusicText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
 vcMusicText.align=kTextAlignRight
-vcMusicSlider=vcxoff opYoffset sliderWidth sliderHeight
-vcMusicLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
-opYoffset=(opYoffset + sliderHeight + 8)
-vcSfxText=vcx (opYoffset + 2) vctextw kLineHeight
+vcMusicSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
+vcMusicLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + ySeparation)
+vcSfxText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
 vcSfxText.align=kTextAlignRight
-vcSfxSlider=vcxoff opYoffset sliderWidth sliderHeight
-vcSfxLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
-opYoffset=(opYoffset + sliderHeight + 8)
-vcSpeechText=vcx (opYoffset + 2) vctextw kLineHeight
+vcSfxSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
+vcSfxLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + ySeparation)
+vcSpeechText=vcx (opYoffset + vcOff) optionsLabelWidth kLineHeight
 vcSpeechText.align=kTextAlignRight
-vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight
-vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight
-opYoffset=(opYoffset + sliderHeight + 12)
+vcSpeechSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
+vcSpeechLabel=(prev.x2 + xSeparation) (opYoffset + vcOff) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + ySeparation)
 
 [midiControls]
-mcx=(opXoffset + 10)
+mcx=(opXoffset + xBorder)
 mcOff=((buttonHeight - kLineHeight) / 2 + 2)
 mcFontButton=mcx opYoffset buttonWidth buttonHeight
-mcFontPath=(prev.x2 + 20) (opYoffset + mcOff) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
-mcFontClearButton=(prev.x2 + 10) (opYoffset + mcOff) kLineHeight kLineHeight
-opYoffset=(opYoffset + buttonHeight + 6 * midiControlsSpacing)
-mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
-opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
-opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcGSCheckbox=mcx opYoffset prev.w buttonHeight
-opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMidiGainText=mcx (opYoffset + 2) 80 kLineHeight
+mcFontPath=(prev.x2 + xSeparation) (opYoffset + mcOff) (parent.w - self.x - xSeparation - kLineHeight - xBorder) kLineHeight
+mcFontClearButton=(prev.x2 + xSeparation) prev.y kLineHeight kLineHeight
+opYoffset=(opYoffset + buttonHeight + ySeparation)
+mcMixedCheckbox=mcx opYoffset (parent.w - self.x - xBorder) kLineHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+mcMt32Checkbox=mcx opYoffset prev.w kLineHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+mcGSCheckbox=mcx opYoffset prev.w kLineHeight
+opYoffset=(opYoffset + prev.h + ySeparation)
+mcOff=((sliderHeight - kLineHeight) / 2 + 2)
+mcMidiGainText=mcx (opYoffset + mcOff) optionsLabelWidth kLineHeight
 mcMidiGainText.align=kTextAlignRight
-mcMidiGainSlider=(prev.x2 + 10) opYoffset sliderWidth sliderHeight
-mcMidiGainLabel=(prev.x2 + 10) (opYoffset + 2) 40 kLineHeight
-opYoffset=(opYoffset + sliderHeight + midiControlsSpacing)
+mcMidiGainSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
+mcMidiGainLabel=(prev.x2 + xSeparation) (opYoffset + mcOff) 40 kLineHeight
+opYoffset=(opYoffset + sliderHeight + ySeparation)
 
 [subtitleControls]
-sbx=(opXoffset + 10)
-sbtextw=110
-sbYoff=(buttonHeight / 8)
-sbOff=((sliderHeight - kLineHeight) / 2)
-opYoffset=(opYoffset + sbYoff)
-subToggleDesc=sbx (opYoffset + sbYoff) sbtextw buttonHeight
+sbx=(opXoffset + xBorder)
+sbOff=((sliderHeight - kLineHeight) / 2 + 2)
+subToggleDesc=sbx (opYoffset + sbOff) optionsLabelWidth kLineHeight
 subToggleDesc.align=kTextAlignRight
-subToggleButton=prev.x2 opYoffset (buttonWidth + 34) sliderHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-subSubtitleSpeedDesc=sbx (opYoffset + sbOff) sbtextw kLineHeight
+subToggleButton=(prev.x2 + xSeparation) opYoffset (buttonWidth + 34) sliderHeight
+opYoffset=(prev.y2 + ySeparation)
+subSubtitleSpeedDesc=sbx (opYoffset + sbOff) optionsLabelWidth kLineHeight
 subSubtitleSpeedDesc.align=kTextAlignRight
-subSubtitleSpeedSlider=prev.x2 opYoffset sliderWidth sliderHeight
-subSubtitleSpeedLabel=(prev.x2 + 10) (opYoffset + sbOff) 24 kLineHeight
-opYoffset=(opYoffset + sliderHeight + 8)
+subSubtitleSpeedSlider=(prev.x2 + xSeparation) opYoffset sliderWidth sliderHeight
+subSubtitleSpeedLabel=(prev.x2 + xSeparation) (opYoffset + sbOff) 24 kLineHeight
+opYoffset=(opYoffset + sliderHeight + ySeparation)
 
 [scummmain]
 ## Main dialog
@@ -593,7 +594,6 @@ def_insetW=(w - buttonWidth - 17 * 2 - insetX)
 def_insetH=(h - 13 - insetY)
 def_launcherVersionX=50
 def_launcherVersionY=5
-def_midiControlsSpacing=2
 def_gameOptionsOverrideVPad=10
 def_aboutXOff=3
 def_aboutYOff=2