[Scummvm-cvs-logs] SF.net SVN: scummvm: [21433] scummvm/trunk/gui

[sev at users.sourceforge.net]

Revision: 21433
Author:   sev
Date:     2006-03-24 09:39:13 -0800 (Fri, 24 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21433&view=rev

Log Message:
-----------
Fix chechbox label alignment.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeClassic.cpp
    scummvm/trunk/gui/ThemeNew.cpp
    scummvm/trunk/gui/widget.cpp
Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp	2006-03-24 17:13:24 UTC (rev 21432)
+++ scummvm/trunk/gui/ThemeClassic.cpp	2006-03-24 17:39:13 UTC (rev 21433)
@@ -303,7 +303,7 @@
 	}
 
 	r2.left += checkBoxSize + 10;
-	_font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignCenter, 0, true);
+	_font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignLeft, 0, true);
 
 	addDirtyRect(r);
 }

Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-03-24 17:13:24 UTC (rev 21432)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-03-24 17:39:13 UTC (rev 21433)
@@ -605,7 +605,7 @@
 	drawSurface(Common::Rect(r.left, r.top, r.left+checkBox->w, r.top+checkBox->h), checkBox, false, false, (state == kStateDisabled) ? 128 : 256);
 
 	r2.left += checkBoxSize + 5;
-	_font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignCenter, 0, false);
+	_font->drawString(&_screen, str, r2.left, r2.top, r2.width(), getColor(state), Graphics::kTextAlignLeft, 0, false);
 
 	addDirtyRect(r);
 }

Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp	2006-03-24 17:13:24 UTC (rev 21432)
+++ scummvm/trunk/gui/widget.cpp	2006-03-24 17:39:13 UTC (rev 21433)
@@ -185,7 +185,6 @@
 ButtonWidget::ButtonWidget(GuiObject *boss, String name, const String &label, uint32 cmd, uint8 hotkey)
 	: StaticTextWidget(boss, name, label), CommandSender(boss),
 	  _cmd(cmd), _hotkey(hotkey) {
-	g_gui.evaluator()->setVar(name + ".align", kTextAlignCenter);
 	_flags = WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG;
 	_type = kButtonWidget;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.