GUI: Got rid of the WidgetSize stuff

svn-id: r35022

engines/scumm/dialogs.cpp

@@ -864,11 +864,7 @@ void ValueDisplayDialog::reflowLayout() {
 	const int screenW = g_system->getOverlayWidth();
 	const int screenH = g_system->getOverlayHeight();
 
-	if (g_gui.getWidgetSize() == GUI::kBigWidgetSize) {
-		_percentBarWidth = kBigPercentBarWidth;
-	} else {
-		_percentBarWidth = kPercentBarWidth;
-	}
+	_percentBarWidth = screenW * 100 / 640;
 
 	int width = g_gui.getStringWidth(_label) + 16 + _percentBarWidth;
 	int height = g_gui.getFontHeight() + 4 * 2;

engines/scumm/dialogs.h

@@ -222,8 +222,6 @@ public:
 
 protected:
 	enum {
-		kPercentBarWidth = 50,
-		kBigPercentBarWidth = 75,
 		kDisplayDelay = 1500
 	};
 	Common::String _label;

gui/ThemeEval.cpp

@@ -38,9 +38,6 @@ void ThemeEval::buildBuiltinVars() {
 	_builtin["kThumbnailWidth"] = kThumbnailWidth;
 	_builtin["kThumbnailHeight"] = kThumbnailHeight1;
 	_builtin["kThumbnailHeight2"] = kThumbnailHeight2;
-	
-	_builtin["kNormalWidgetSize"] = GUI::kNormalWidgetSize;
-	_builtin["kBigWidgetSize"] = GUI::kBigWidgetSize;
 }
 
 void ThemeEval::reset() {

gui/newgui.cpp

@@ -380,10 +380,6 @@ void NewGui::animateCursor() {
 	}
 }
 
-WidgetSize NewGui::getWidgetSize() {
-	return (WidgetSize)(g_gui.xmlEval()->getVar("Globals.WidgetSize"));
-}
-
 void NewGui::clearDragWidget() {
 	if (!_dialogStack.empty())
 		_dialogStack.top()->_dragWidget = 0;

gui/newgui.h

@@ -88,8 +88,6 @@ public:
 	int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); }
 	int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }
 
-	WidgetSize getWidgetSize();
-
 	void clearDragWidget();
 
 	void screenChange();

gui/themes/default.inc

@@ -310,7 +310,6 @@
 "<def var='Line.Height' value='16' /> "
 "<def var='Font.Height' value='16' /> "
 "<def var='TabLabelWidth' value='110' /> "
-"<def var='WidgetSize' value='kBigWidgetSize' /> "
 "<def var='About.OuterBorder' value='80'/> "
 "<def var='PopUpWidget.labelSpacing' value='10' /> "
 "<def var='Layout.Spacing' value='8' /> "
@@ -925,7 +924,6 @@
 "<def var='Line.Height' value='12' /> "
 "<def var='Font.Height' value='10' /> "
 "<def var='TabLabelWidth' value='100' /> "
-"<def var='WidgetSize' value='kNormalWidgetSize' /> "
 "<def var='About.OuterBorder' value='10'/> "
 "<def var='PopUpWidget.labelSpacing' value='6' /> "
 "<def var='Layout.Spacing' value='8'/> "

gui/themes/scummclassic/classic_layout.stx

@@ -29,7 +29,6 @@
 		<def var = 'Font.Height' value = '16' />
 		<def var = 'TabLabelWidth' value = '110' />
 		
-		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
 		<def var = 'About.OuterBorder' value = '80'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '10' />
 		

gui/themes/scummclassic/classic_layout_320.stx

@@ -29,7 +29,6 @@
 		<def var = 'Font.Height' value = '10' />
 		<def var = 'TabLabelWidth' value = '100' />
 
-		<def var = 'WidgetSize' value = 'kNormalWidgetSize' />
 		<def var = 'About.OuterBorder' value = '10'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '6' />
 		

gui/themes/scummmodern/scummmodern_layout.stx

@@ -29,8 +29,6 @@
 		<def var = 'Font.Height' value = '16' />
 		<def var = 'TabLabelWidth' value = '110' />
 		
-		<def var = 'WidgetSize' value = 'kBigWidgetSize' />
-		
 		<def var = 'Padding.Bottom' value = '16' />
 		<def var = 'Padding.Left' value = '16' />
 		<def var = 'Padding.Right' value = '16' />

gui/themes/scummmodern/scummmodern_layout_320.stx

@@ -29,7 +29,6 @@
 		<def var = 'Font.Height' value = '10' />
 		<def var = 'TabLabelWidth' value = '100' />
 
-		<def var = 'WidgetSize' value = 'kNormalWidgetSize' />
 		<def var = 'About.OuterBorder' value = '10'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '6' />
 

gui/widget.h

@@ -66,12 +66,6 @@ enum {
 	kCaretBlinkTime = 300
 };
 
-enum WidgetSize {
-	kDefaultWidgetSize,
-	kNormalWidgetSize,
-	kBigWidgetSize
-};
-
 /* Widget */
 class Widget : public GuiObject {
 	friend class Dialog;