[Scummvm-cvs-logs] SF.net SVN: scummvm:[41265] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Jun 6 19:51:41 CEST 2009
Revision: 41265
http://scummvm.svn.sourceforge.net/scummvm/?rev=41265&view=rev
Author: sev
Date: 2009-06-06 17:51:41 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
Implement widget property "textalign". Added it to all theme layouts
Modified Paths:
--------------
scummvm/trunk/graphics/font.h
scummvm/trunk/gui/ThemeEngine.h
scummvm/trunk/gui/ThemeEval.cpp
scummvm/trunk/gui/ThemeEval.h
scummvm/trunk/gui/ThemeParser.cpp
scummvm/trunk/gui/ThemeParser.h
scummvm/trunk/gui/themes/default.inc
scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
scummvm/trunk/gui/themes/scummclassic.zip
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx
scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
scummvm/trunk/gui/themes/scummmodern.zip
scummvm/trunk/gui/widget.cpp
Modified: scummvm/trunk/graphics/font.h
===================================================================
--- scummvm/trunk/graphics/font.h 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/graphics/font.h 2009-06-06 17:51:41 UTC (rev 41265)
@@ -36,6 +36,7 @@
/** Text alignment modes */
enum TextAlign {
+ kTextAlignInvalid,
kTextAlignLeft, //!< Text should be aligned to the left
kTextAlignCenter, //!< Text should be centered
kTextAlignRight //!< Text should be aligned to the right
Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/ThemeEngine.h 2009-06-06 17:51:41 UTC (rev 41265)
@@ -31,6 +31,7 @@
#include "common/fs.h"
#include "graphics/surface.h"
#include "graphics/fontman.h"
+#include "graphics/font.h"
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.4"
@@ -123,6 +124,7 @@
public:
//! Vertical alignment of the text.
enum TextAlignVertical {
+ kTextAlignVInvalid,
kTextAlignVBottom,
kTextAlignVCenter,
kTextAlignVTop
Modified: scummvm/trunk/gui/ThemeEval.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEval.cpp 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/ThemeEval.cpp 2009-06-06 17:51:41 UTC (rev 41265)
@@ -67,7 +67,7 @@
}
-void ThemeEval::addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled) {
+void ThemeEval::addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled, Graphics::TextAlign align) {
int typeW = -1;
int typeH = -1;
@@ -82,6 +82,7 @@
_curLayout.top()->addChild(widget);
setVar(_curDialog + "." + name + ".Enabled", enabled ? 1 : 0);
+ setVar(_curDialog + "." + name + ".Align", align);
}
void ThemeEval::addDialog(const Common::String &name, const Common::String &overlays, bool enabled, int inset) {
Modified: scummvm/trunk/gui/ThemeEval.h
===================================================================
--- scummvm/trunk/gui/ThemeEval.h 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/ThemeEval.h 2009-06-06 17:51:41 UTC (rev 41265)
@@ -30,6 +30,7 @@
#include "common/hashmap.h"
#include "common/hash-str.h"
#include "common/stack.h"
+#include "graphics/font.h"
#include "gui/ThemeLayout.h"
@@ -76,7 +77,7 @@
void addDialog(const Common::String &name, const Common::String &overlays, bool enabled = true, int inset = 0);
void addLayout(ThemeLayout::LayoutType type, int spacing, bool center = false);
- void addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled = true);
+ void addWidget(const Common::String &name, int w, int h, const Common::String &type, bool enabled = true, Graphics::TextAlign align = Graphics::kTextAlignLeft);
bool addImportedLayout(const Common::String &name);
void addSpace(int size);
Modified: scummvm/trunk/gui/ThemeParser.cpp
===================================================================
--- scummvm/trunk/gui/ThemeParser.cpp 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/ThemeParser.cpp 2009-06-06 17:51:41 UTC (rev 41265)
@@ -62,7 +62,29 @@
return kTextDataNone;
}
+static Graphics::TextAlign parseTextHAlign(const Common::String &val) {
+ if (val == "left")
+ return Graphics::kTextAlignLeft;
+ else if (val == "right")
+ return Graphics::kTextAlignRight;
+ else if (val == "center")
+ return Graphics::kTextAlignCenter;
+ else
+ return Graphics::kTextAlignInvalid;
+}
+static GUI::ThemeEngine::TextAlignVertical parseTextVAlign(const Common::String &val) {
+ if (val == "top")
+ return GUI::ThemeEngine::kTextAlignVTop;
+ else if (val == "center")
+ return GUI::ThemeEngine::kTextAlignVCenter;
+ else if (val == "bottom")
+ return GUI::ThemeEngine::kTextAlignVBottom;
+ else
+ return GUI::ThemeEngine::kTextAlignVInvalid;
+}
+
+
ThemeParser::ThemeParser(ThemeEngine *parent) : XMLParser() {
_drawFunctions["circle"] = &Graphics::VectorRenderer::drawCallback_CIRCLE;
@@ -206,22 +228,10 @@
Graphics::TextAlign alignH;
GUI::ThemeEngine::TextAlignVertical alignV;
- if (node->values["horizontal_align"] == "left")
- alignH = Graphics::kTextAlignLeft;
- else if (node->values["horizontal_align"] == "right")
- alignH = Graphics::kTextAlignRight;
- else if (node->values["horizontal_align"] == "center")
- alignH = Graphics::kTextAlignCenter;
- else
+ if ((alignH = parseTextHAlign(node->values["horizontal_align"])) == Graphics::kTextAlignInvalid)
return parserError("Invalid value for text alignment.");
- if (node->values["vertical_align"] == "top")
- alignV = GUI::ThemeEngine::kTextAlignVTop;
- else if (node->values["vertical_align"] == "center")
- alignV = GUI::ThemeEngine::kTextAlignVCenter;
- else if (node->values["vertical_align"] == "bottom")
- alignV = GUI::ThemeEngine::kTextAlignVBottom;
- else
+ if ((alignV = parseTextVAlign(node->values["vertical_align"])) == GUI::ThemeEngine::kTextAlignVInvalid)
return parserError("Invalid value for text alignment.");
Common::String id = getParentNode(node)->values["id"];
@@ -566,7 +576,14 @@
return parserError("Corrupted height value in key for %s", var.c_str());
}
- _theme->getEvaluator()->addWidget(var, width, height, node->values["type"], enabled);
+ Graphics::TextAlign alignH = Graphics::kTextAlignLeft;
+
+ if (node->values.contains("textalign")) {
+ if((alignH = parseTextHAlign(node->values["textalign"])) == Graphics::kTextAlignInvalid)
+ return parserError("Invalid value for text alignment.");
+ }
+
+ _theme->getEvaluator()->addWidget(var, width, height, node->values["type"], enabled, alignH);
}
return true;
Modified: scummvm/trunk/gui/ThemeParser.h
===================================================================
--- scummvm/trunk/gui/ThemeParser.h 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/ThemeParser.h 2009-06-06 17:51:41 UTC (rev 41265)
@@ -169,6 +169,7 @@
XML_PROP(pos, false)
XML_PROP(padding, false)
XML_PROP(resolution, false)
+ XML_PROP(textalign, false)
KEY_END()
KEY_END()
@@ -195,6 +196,7 @@
XML_PROP(height, false)
XML_PROP(type, false)
XML_PROP(enabled, false)
+ XML_PROP(textalign, false)
KEY_END()
XML_KEY(space)
Modified: scummvm/trunk/gui/themes/default.inc
===================================================================
--- scummvm/trunk/gui/themes/default.inc 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/themes/default.inc 2009-06-06 17:51:41 UTC (rev 41265)
@@ -484,6 +484,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subToggleButton' "
"width='150' "
@@ -493,6 +494,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='subSubtitleSpeedDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subSubtitleSpeedSlider' "
"type='Slider' "
@@ -509,6 +511,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcMusicText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcMusicSlider' "
"type='Slider' "
@@ -520,6 +523,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcSfxText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcSfxSlider' "
"type='Slider' "
@@ -531,6 +535,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcSpeechText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcSpeechSlider' "
"type='Slider' "
@@ -716,6 +721,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
"<widget name='Id' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='Domain' "
"type='PopUp' "
@@ -724,6 +730,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='16'> "
"<widget name='Name' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='Desc' "
"type='PopUp' "
@@ -884,6 +891,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subToggleButton' "
"width='158' "
@@ -893,6 +901,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subSubtitleSpeedDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subSubtitleSpeedSlider' "
"type='Slider' "
@@ -1147,6 +1156,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subToggleButton' "
"width='128' "
@@ -1156,6 +1166,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='subSubtitleSpeedDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subSubtitleSpeedSlider' "
"type='Slider' "
@@ -1171,6 +1182,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcMusicText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcMusicSlider' "
"type='Slider' "
@@ -1182,6 +1194,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcSfxText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcSfxSlider' "
"type='Slider' "
@@ -1193,6 +1206,7 @@
"<layout type='horizontal' padding='0,0,0,0'> "
"<widget name='vcSpeechText' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='vcSpeechSlider' "
"type='Slider' "
@@ -1379,6 +1393,7 @@
"<widget name='Id' "
"width='35' "
"height='Globals.Line.Height' "
+"textalign='right' "
"/> "
"<widget name='Domain' "
"type='PopUp' "
@@ -1388,6 +1403,7 @@
"<widget name='Name' "
"width='35' "
"height='Globals.Line.Height' "
+"textalign='right' "
"/> "
"<widget name='Desc' "
"type='PopUp' "
@@ -1553,6 +1569,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subToggleDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subToggleButton' "
"width='128' "
@@ -1562,6 +1579,7 @@
"<layout type='horizontal' padding='0,0,0,0' spacing='8'> "
"<widget name='subSubtitleSpeedDesc' "
"type='OptionsLabel' "
+"textalign='right' "
"/> "
"<widget name='subSubtitleSpeedSlider' "
"type='Slider' "
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout.stx 2009-06-06 17:51:41 UTC (rev 41265)
@@ -195,6 +195,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '150'
@@ -204,6 +205,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
@@ -221,6 +223,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcMusicText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcMusicSlider'
type = 'Slider'
@@ -232,6 +235,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSfxText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSfxSlider'
type = 'Slider'
@@ -243,6 +247,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSpeechText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSpeechSlider'
type = 'Slider'
@@ -438,6 +443,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'Id'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'Domain'
type = 'PopUp'
@@ -446,6 +452,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'Name'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'Desc'
type = 'PopUp'
@@ -611,6 +618,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '158'
@@ -620,6 +628,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
Modified: scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/themes/scummclassic/classic_layout_lowres.stx 2009-06-06 17:51:41 UTC (rev 41265)
@@ -192,6 +192,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '128'
@@ -201,6 +202,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
@@ -217,6 +219,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcMusicText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcMusicSlider'
type = 'Slider'
@@ -228,6 +231,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSfxText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSfxSlider'
type = 'Slider'
@@ -239,6 +243,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSpeechText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSpeechSlider'
type = 'Slider'
@@ -435,6 +440,7 @@
<widget name = 'Id'
width = '35'
height = 'Globals.Line.Height'
+ textalign = 'right'
/>
<widget name = 'Domain'
type = 'PopUp'
@@ -444,6 +450,7 @@
<widget name = 'Name'
width = '35'
height = 'Globals.Line.Height'
+ textalign = 'right'
/>
<widget name = 'Desc'
type = 'PopUp'
@@ -613,6 +620,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '128'
@@ -622,6 +630,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
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 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout.stx 2009-06-06 17:51:41 UTC (rev 41265)
@@ -210,7 +210,8 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
- />
+ textalign = 'right'
+ />
<widget name = 'subToggleButton'
width = '150'
height = 'Globals.Slider.Height'
@@ -219,6 +220,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
@@ -236,6 +238,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcMusicText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcMusicSlider'
type = 'Slider'
@@ -247,6 +250,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSfxText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSfxSlider'
type = 'Slider'
@@ -258,6 +262,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSpeechText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSpeechSlider'
type = 'Slider'
@@ -453,6 +458,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'Id'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'Domain'
type = 'PopUp'
@@ -461,6 +467,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '16'>
<widget name = 'Name'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'Desc'
type = 'PopUp'
@@ -626,6 +633,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '158'
@@ -635,6 +643,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
Modified: scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx
===================================================================
--- scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/themes/scummmodern/scummmodern_layout_lowres.stx 2009-06-06 17:51:41 UTC (rev 41265)
@@ -190,6 +190,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '128'
@@ -199,6 +200,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
@@ -215,6 +217,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcMusicText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcMusicSlider'
type = 'Slider'
@@ -226,6 +229,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSfxText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSfxSlider'
type = 'Slider'
@@ -237,6 +241,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'vcSpeechText'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'vcSpeechSlider'
type = 'Slider'
@@ -433,6 +438,7 @@
<widget name = 'Id'
width = '35'
height = 'Globals.Line.Height'
+ textalign = 'right'
/>
<widget name = 'Domain'
type = 'PopUp'
@@ -442,6 +448,7 @@
<widget name = 'Name'
width = '35'
height = 'Globals.Line.Height'
+ textalign = 'right'
/>
<widget name = 'Desc'
type = 'PopUp'
@@ -604,6 +611,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subToggleDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subToggleButton'
width = '128'
@@ -613,6 +621,7 @@
<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '8'>
<widget name = 'subSubtitleSpeedDesc'
type = 'OptionsLabel'
+ textalign = 'right'
/>
<widget name = 'subSubtitleSpeedSlider'
type = 'Slider'
Modified: scummvm/trunk/gui/themes/scummmodern.zip
===================================================================
(Binary files differ)
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2009-06-06 17:50:30 UTC (rev 41264)
+++ scummvm/trunk/gui/widget.cpp 2009-06-06 17:51:41 UTC (rev 41265)
@@ -192,7 +192,7 @@
_type = kStaticTextWidget;
_label = text;
- _align = (Graphics::TextAlign)g_gui.xmlEval()->getVar(name + ".Align", Graphics::kTextAlignLeft);
+ _align = (Graphics::TextAlign)g_gui.xmlEval()->getVar("Dialog." + name + ".Align", Graphics::kTextAlignLeft);
}
void StaticTextWidget::setValue(int value) {
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