[Scummvm-cvs-logs] SF.net SVN: scummvm: [22536] scummvm/trunk/gui/EditTextWidget.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 22536
Author:   eriktorbjorn
Date:     2006-05-19 15:41:51 -0700 (Fri, 19 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22536&view=rev

Log Message:
-----------
Call handleScreenChanged() *before* calling setEditString(). Otherwise
_leftPadding may be wrong, or even undefined, when getEditRect() is called,
which may cause ScummVM to trigger an "invalid rect" assertion.

Modified Paths:
--------------
    scummvm/trunk/gui/EditTextWidget.cpp
Modified: scummvm/trunk/gui/EditTextWidget.cpp
===================================================================
--- scummvm/trunk/gui/EditTextWidget.cpp	2006-05-19 22:26:07 UTC (rev 22535)
+++ scummvm/trunk/gui/EditTextWidget.cpp	2006-05-19 22:41:51 UTC (rev 22536)
@@ -32,9 +32,8 @@
 	_flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE;
 	_type = kEditTextWidget;
 
-	setEditString(text);
-
 	handleScreenChanged();
+	setEditString(text);
 }
 
 EditTextWidget::EditTextWidget(GuiObject *boss, String name, const String &text)
@@ -43,9 +42,8 @@
 	_type = kEditTextWidget;
 	_hints |= THEME_HINT_USE_SHADOW;
 
-	setEditString(text);
-
 	handleScreenChanged();
+	setEditString(text);
 }
 
 void EditTextWidget::setEditString(const String &str) {


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