[Scummvm-cvs-logs] SF.net SVN: scummvm:[35022] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Nov 12 14:14:44 CET 2008
Revision: 35022
http://scummvm.svn.sourceforge.net/scummvm/?rev=35022&view=rev
Author: fingolfin
Date: 2008-11-12 13:14:44 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
GUI: Got rid of the WidgetSize stuff
Modified Paths:
--------------
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.h
scummvm/trunk/gui/ThemeEval.cpp
scummvm/trunk/gui/newgui.cpp
scummvm/trunk/gui/newgui.h
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_320.stx
scummvm/trunk/gui/themes/scummmodern.zip
scummvm/trunk/gui/widget.h
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2008-11-12 13:14:44 UTC (rev 35022)
@@ -864,11 +864,7 @@
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;
Modified: scummvm/trunk/engines/scumm/dialogs.h
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.h 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/engines/scumm/dialogs.h 2008-11-12 13:14:44 UTC (rev 35022)
@@ -222,8 +222,6 @@
protected:
enum {
- kPercentBarWidth = 50,
- kBigPercentBarWidth = 75,
kDisplayDelay = 1500
};
Common::String _label;
Modified: scummvm/trunk/gui/ThemeEval.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEval.cpp 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/ThemeEval.cpp 2008-11-12 13:14:44 UTC (rev 35022)
@@ -38,9 +38,6 @@
_builtin["kThumbnailWidth"] = kThumbnailWidth;
_builtin["kThumbnailHeight"] = kThumbnailHeight1;
_builtin["kThumbnailHeight2"] = kThumbnailHeight2;
-
- _builtin["kNormalWidgetSize"] = GUI::kNormalWidgetSize;
- _builtin["kBigWidgetSize"] = GUI::kBigWidgetSize;
}
void ThemeEval::reset() {
Modified: scummvm/trunk/gui/newgui.cpp
===================================================================
--- scummvm/trunk/gui/newgui.cpp 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/newgui.cpp 2008-11-12 13:14:44 UTC (rev 35022)
@@ -380,10 +380,6 @@
}
}
-WidgetSize NewGui::getWidgetSize() {
- return (WidgetSize)(g_gui.xmlEval()->getVar("Globals.WidgetSize"));
-}
-
void NewGui::clearDragWidget() {
if (!_dialogStack.empty())
_dialogStack.top()->_dragWidget = 0;
Modified: scummvm/trunk/gui/newgui.h
===================================================================
--- scummvm/trunk/gui/newgui.h 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/newgui.h 2008-11-12 13:14:44 UTC (rev 35022)
@@ -88,8 +88,6 @@
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();
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/themes/default.inc 2008-11-12 13:14:44 UTC (rev 35022)
@@ -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'/> "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2008-11-12 13:14:44 UTC (rev 35022)
@@ -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' />
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_320.stx 2008-11-12 13:14:44 UTC (rev 35022)
@@ -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' />
Modified: scummvm/trunk/gui/themes/scummclassic.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2008-11-12 13:14:44 UTC (rev 35022)
@@ -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' />
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_320.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_320.stx 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_320.stx 2008-11-12 13:14:44 UTC (rev 35022)
@@ -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' />
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h 2008-11-12 13:07:41 UTC (rev 35021)
+++ scummvm/trunk/gui/widget.h 2008-11-12 13:14:44 UTC (rev 35022)
@@ -66,12 +66,6 @@
kCaretBlinkTime = 300
};
-enum WidgetSize {
- kDefaultWidgetSize,
- kNormalWidgetSize,
- kBigWidgetSize
-};
-
/* Widget */
class Widget : public GuiObject {
friend class Dialog;
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