13 files changed, 1 insertions, 29 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 581c16ca06..1cb4e8a41d 100644
--- a/engines/scumm/dialogs.cpp
+++ b/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;
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 3837787a3b..290b3450dc 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -222,8 +222,6 @@ public:
 
 protected:
 	enum {
-		kPercentBarWidth = 50,
-		kBigPercentBarWidth = 75,
 		kDisplayDelay = 1500
 	};
 	Common::String _label;
diff --git a/gui/ThemeEval.cpp b/gui/ThemeEval.cpp
index a448048d60..753455e799 100644
--- a/gui/ThemeEval.cpp
+++ b/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() {
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index d8c3a8212e..aa778b834c 100644
--- a/gui/newgui.cpp
+++ b/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;
diff --git a/gui/newgui.h b/gui/newgui.h
index c87b4fd177..e7ee19769e 100644
--- a/gui/newgui.h
+++ b/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();
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index aa38639ee1..89a9a5d620 100644
--- a/gui/themes/default.inc
+++ b/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'/> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 91b5362f55..4add34070c 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 005230b569..3b447e29af 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/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' />
 		
diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx
index 16e71731e9..c77518ea21 100644
--- a/gui/themes/scummclassic/classic_layout_320.stx
+++ b/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' />
 		
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 61cb8aa5e8..4e18963deb 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 6f8033e7bd..8748cc4261 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/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' />
diff --git a/gui/themes/scummmodern/scummmodern_layout_320.stx b/gui/themes/scummmodern/scummmodern_layout_320.stx
index 8ac6af33ef..312135b77e 100644
--- a/gui/themes/scummmodern/scummmodern_layout_320.stx
+++ b/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' />
 
diff --git a/gui/widget.h b/gui/widget.h
index 07c5964207..3174d4416a 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -66,12 +66,6 @@ enum {
 	kCaretBlinkTime = 300
 };
 
-enum WidgetSize {
-	kDefaultWidgetSize,
-	kNormalWidgetSize,
-	kBigWidgetSize
-};
-
 /* Widget */
 class Widget : public GuiObject {
 	friend class Dialog;