diff options
| author | frosch <frosch@openttd.org> | 2012-11-28 20:54:56 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-11-28 20:54:56 +0000 |
| commit | 155a9d784c84e2a69a4506b19e0d5204aebcebec (patch) | |
| tree | b5b84bd629fb15dd3b2aeb69e877efb6648e7a46 /src/misc_gui.cpp | |
| parent | 4c0671f65af64c1fcc1c0373cfa4e1be455b5787 (diff) | |
| download | openttd-155a9d784c84e2a69a4506b19e0d5204aebcebec.tar.xz | |
(svn r24772) -Codechange: Call Window::OnEditboxChanged only when the content changes, not when only moving the cursor.
Diffstat (limited to 'src/misc_gui.cpp')
| -rw-r--r-- | src/misc_gui.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index c47f62998..a94e49a3b 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -719,6 +719,8 @@ HandleEditBoxResult QueryString::HandleEditBoxKey(Window *w, int wid, uint16 key state = ES_HANDLED; + bool edited = false; + switch (keycode) { case WKC_ESC: return HEBR_CANCEL; @@ -728,7 +730,7 @@ HandleEditBoxResult QueryString::HandleEditBoxKey(Window *w, int wid, uint16 key case (WKC_META | 'V'): #endif case (WKC_CTRL | 'V'): - if (this->text.InsertClipboard()) w->SetWidgetDirty(wid); + edited = this->text.InsertClipboard(); break; #ifdef WITH_COCOA @@ -736,22 +738,22 @@ HandleEditBoxResult QueryString::HandleEditBoxKey(Window *w, int wid, uint16 key #endif case (WKC_CTRL | 'U'): this->text.DeleteAll(); - w->SetWidgetDirty(wid); + edited = true; break; case WKC_BACKSPACE: case WKC_DELETE: case WKC_CTRL | WKC_BACKSPACE: case WKC_CTRL | WKC_DELETE: - if (this->text.DeleteChar(keycode)) w->SetWidgetDirty(wid); + edited = this->text.DeleteChar(keycode); break; case WKC_LEFT: case WKC_RIGHT: case WKC_END: case WKC_HOME: case WKC_CTRL | WKC_LEFT: case WKC_CTRL | WKC_RIGHT: - if (this->text.MovePos(keycode)) w->SetWidgetDirty(wid); + this->text.MovePos(keycode); break; default: if (IsValidChar(key, this->afilter)) { - if (this->text.InsertChar(key)) w->SetWidgetDirty(wid); + edited = this->text.InsertChar(key); } else { state = ES_NOT_HANDLED; } @@ -760,7 +762,7 @@ HandleEditBoxResult QueryString::HandleEditBoxKey(Window *w, int wid, uint16 key Window *osk = FindWindowById(WC_OSK, 0); if (osk != NULL && osk->parent == w) osk->InvalidateData(); - return HEBR_EDITING; + return edited ? HEBR_EDITING : HEBR_CURSOR; } void QueryString::HandleEditBox(Window *w, int wid) |