cpp/openttd-patchpack/source Changeset - r20400:8b2520e090f7

Changeset - r20400:8b2520e090f7

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 11 years ago 2013-06-15 15:31:04
frosch@openttd.org

(svn r25413) -Fix-ish: Suppress focussing editboxes which are not visible.

3 files changed with 10 insertions and 1 deletions:

src/ai/ai_gui.cpp

src/newgrf_gui.cpp

src/window.cpp

0 comments (0 inline, 0 general)

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -1061,6 +1061,8 @@ struct AIDebugWindow : public Window { @@
 		this->querystrings[WID_AID_BREAK_STR_EDIT_BOX] = &this->break_editbox;
 		SetWidgetsDisabledState(!this->show_break_box, WID_AID_BREAK_STR_ON_OFF_BTN, WID_AID_BREAK_STR_EDIT_BOX, WID_AID_MATCH_CASE_BTN, WIDGET_LIST_END);
 		/* Restore the break string value from static variable */
 		this->break_editbox.text.Assign(this->break_string);

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -646,7 +646,11 @@ struct NewGRFWindow : public Window, New @@
 		this->querystrings[WID_NS_FILTER] = &this->filter_editbox;
 		this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR;
 		if (editable) this->SetFocusedWidget(WID_NS_FILTER);
 		if (editable) {
 			this->SetFocusedWidget(WID_NS_FILTER);
 		} else {
 			this->DisableWidget(WID_NS_FILTER);
+		}
 		this->avails.SetListing(this->last_sorting);
 		this->avails.SetFiltering(this->last_filtering);

src/window.cpp

➞

Show inline comments

@@ @@ -482,6 +482,8 @@ EventState Window::OnHotkey(int hotkey) @@
 	if (nw == NULL || nw->IsDisabled()) return ES_NOT_HANDLED;
 	if (nw->type == WWT_EDITBOX) {
 		if (this->IsShaded()) return ES_NOT_HANDLED;
 		/* Focus editbox */
 		this->SetFocusedWidget(hotkey);
 		SetFocusedWindow(this);
@@ @@ -891,6 +893,7 @@ void Window::SetShaded(bool make_shaded) @@
 	int desired = make_shaded ? SZSP_HORIZONTAL : 0;
 	if (this->shade_select->shown_plane != desired) {
 		if (make_shaded) {
 			if (this->nested_focus != NULL) this->UnfocusFocusedWidget();
 			this->unshaded_size.width  = this->width;
 			this->unshaded_size.height = this->height;
 			this->shade_select->SetDisplayedPlane(desired);

0 comments (0 inline, 0 general)