From dcc90445f6ea424bd4576f04afbc790fc43a5c76 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Jun 2009 17:53:25 +0000
Subject: Add to launcher not yet functional search widget. Make EditableWidget
 CommandSender

svn-id: r41267
---
 gui/EditTextWidget.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gui/EditTextWidget.cpp')

diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index c977ecc3d0..ac3967589a 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -30,16 +30,16 @@
 
 namespace GUI {
 
-EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text)
-	: EditableWidget(boss, x, y - 1, w, h + 2) {
+EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, const String &text, uint32 cmd)
+	: EditableWidget(boss, x, y - 1, w, h + 2, cmd) {
 	setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE);
 	_type = kEditTextWidget;
 
 	setEditString(text);
 }
 
-EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text)
-	: EditableWidget(boss, name) {
+EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text, uint32 cmd)
+	: EditableWidget(boss, name, cmd) {
 	setFlags(WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE);
 	_type = kEditTextWidget;
 
-- 
cgit v1.2.3


From 020450465d72cc9c97aa9d9b145ed56984becd9f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Jun 2009 17:54:43 +0000
Subject: Fix font size in EditTextWidget on screen resolution change.

svn-id: r41270
---
 gui/EditTextWidget.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gui/EditTextWidget.cpp')

diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index ac3967589a..597fb85db6 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -55,8 +55,6 @@ void EditTextWidget::reflowLayout() {
 	_leftPadding = g_gui.xmlEval()->getVar("Globals.EditTextWidget.Padding.Left", 0);
 	_rightPadding = g_gui.xmlEval()->getVar("Globals.EditTextWidget.Padding.Right", 0);
 
-	_font = (ThemeEngine::FontStyle)g_gui.xmlEval()->getVar("EditTextWidget.Font", ThemeEngine::kFontStyleNormal);
-
 	EditableWidget::reflowLayout();
 }
 
-- 
cgit v1.2.3


From 34d097be204ca448202da34852dd4df397fcd83b Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 6 Jun 2009 23:22:35 +0000
Subject: GUI: Pressing 'ESC' in the Launcher's quick search field now resets
 the search filter

svn-id: r41310
---
 gui/EditTextWidget.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gui/EditTextWidget.cpp')

diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index 597fb85db6..f38f9f5b94 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -111,6 +111,7 @@ void EditTextWidget::endEditMode() {
 
 void EditTextWidget::abortEditMode() {
 	setEditString(_backupString);
+	sendCommand(_cmd, 0);
 	releaseFocus();
 }
 
-- 
cgit v1.2.3