[Scummvm-cvs-logs] scummvm master -> dfadf40d4273a0ef593188ccef47de486e5e87c6

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6224b74f34 GUI: Let EditTextWidget notify when the editing is finished
dfadf40d42 HUGO: Close prompt box dialog on Return key


Commit: 6224b74f34f0c055b6d9e2511bf9688d02c946c3
    https://github.com/scummvm/scummvm/commit/6224b74f34f0c055b6d9e2511bf9688d02c946c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-04-16T06:18:59-07:00

Commit Message:
GUI: Let EditTextWidget notify when the editing is finished

Changed paths:
    gui/widgets/edittext.cpp
    gui/widgets/edittext.h



diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index 3ef8132..159943f 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -30,18 +30,20 @@
 
 namespace GUI {
 
-EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip, uint32 cmd)
+	EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd)
 	: EditableWidget(boss, x, y - 1, w, h + 2, tooltip, cmd) {
 	setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE);
 	_type = kEditTextWidget;
+	_finishCmd = finishCmd;
 
 	setEditString(text);
 }
 
-EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltip, uint32 cmd)
+EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd)
 	: EditableWidget(boss, name, tooltip, cmd) {
 	setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE);
 	_type = kEditTextWidget;
+	_finishCmd = finishCmd;
 
 	setEditString(text);
 }
@@ -107,6 +109,8 @@ void EditTextWidget::startEditMode() {
 
 void EditTextWidget::endEditMode() {
 	releaseFocus();
+
+	sendCommand(_finishCmd, 0);
 }
 
 void EditTextWidget::abortEditMode() {
diff --git a/gui/widgets/edittext.h b/gui/widgets/edittext.h
index a254988..b94e587 100644
--- a/gui/widgets/edittext.h
+++ b/gui/widgets/edittext.h
@@ -41,8 +41,8 @@ protected:
 	int				_rightPadding;
 
 public:
-	EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip = 0, uint32 cmd = 0);
-	EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltp = 0, uint32 cmd = 0);
+	EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, const char *tooltip = 0, uint32 cmd = 0, uint32 finishCmd = 0);
+	EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltp = 0, uint32 cmd = 0, uint32 finishCmd = 0);
 
 	void setEditString(const String &str);
 
@@ -62,6 +62,8 @@ protected:
 	void abortEditMode();
 
 	Common::Rect getEditRect() const;
+
+	uint32 _finishCmd;
 };
 
 } // End of namespace GUI


Commit: dfadf40d4273a0ef593188ccef47de486e5e87c6
    https://github.com/scummvm/scummvm/commit/dfadf40d4273a0ef593188ccef47de486e5e87c6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-04-16T06:19:44-07:00

Commit Message:
HUGO: Close prompt box dialog on Return key

Changed paths:
    engines/hugo/dialogs.cpp
    engines/hugo/dialogs.h



diff --git a/engines/hugo/dialogs.cpp b/engines/hugo/dialogs.cpp
index 2d495d6..096cea8 100644
--- a/engines/hugo/dialogs.cpp
+++ b/engines/hugo/dialogs.cpp
@@ -269,7 +269,7 @@ EntryDialog::EntryDialog(const Common::String &title, const Common::String &butt
 								lines[i], Graphics::kTextAlignCenter);
 	}
 
-	_text = new GUI::EditTextWidget(this, 10, 10 + lineCount * (kLineHeight + 1), _w - 20, kLineHeight, "");
+	_text = new GUI::EditTextWidget(this, 10, 10 + lineCount * (kLineHeight + 1), _w - 20, kLineHeight, "", "", 0, kCmdFinishEdit);
 	_text->setEditString(defaultValue);
 
 	_h += kLineHeight + 5;
@@ -286,6 +286,7 @@ EntryDialog::~EntryDialog() {
 void EntryDialog::handleCommand(GUI::CommandSender *sender, uint32 command, uint32 data) {
 	switch (command) {
 	case kCmdButton:
+	case kCmdFinishEdit:
 		close();
 		break;
 	default:
diff --git a/engines/hugo/dialogs.h b/engines/hugo/dialogs.h
index 917c929..56dbd41 100644
--- a/engines/hugo/dialogs.h
+++ b/engines/hugo/dialogs.h
@@ -67,7 +67,8 @@ enum {
 	kCmdInvent = 'INVT',
 
 	// EntryDialog commands
-	kCmdButton = 'BTNP'
+	kCmdButton = 'BTNP',
+	kCmdFinishEdit = 'FNSH'
 };
 
 class TopMenu : public GUI::Dialog {