mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17503) -Fix (r17502): Save all files before commit.

release/1.0
alberth 2009-09-11 18:54:33 +00:00
parent 669b7d01ac
commit e1ae20a307
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/window_gui.h
View File

@ -503,16 +503,33 @@ public:
*/ */
inline bool SetFocusedWidget(byte widget_index) inline bool SetFocusedWidget(byte widget_index)
{ {
if (widget_index >= this->widget_count || this->widget + widget_index == this->focused_widget) { if (this->widget != NULL) {
return false; /* Do nothing if widget_index is already focused, or if it wasn't a valid widget. */
if (widget_index >= this->widget_count || this->widget + widget_index == this->focused_widget) return false;
if (this->focused_widget != NULL) {
/* Repaint the widget that lost focus. A focused edit box may else leave the caret on the screen. */
this->InvalidateWidget(this->focused_widget - this->widget);
}
this->focused_widget = &this->widget[widget_index];
return true;
} }
if (this->focused_widget != NULL) { if (this->nested_array != NULL) {
/* Repaint the widget that lost focus. A focused edit box may else leave the caret on the screen. */ /* Do nothing if widget_index is already focused, or if it wasn't a valid widget. */
this->InvalidateWidget(this->focused_widget - this->widget); if (widget_index >= this->nested_array_size) return false;
assert(this->nested_array[widget_index] != NULL); // Setting focus to a non-existing widget is a bad idea.
if (this->nested_focus != NULL) {
if (this->nested_array[widget_index] == this->nested_focus) return false;
/* Repaint the widget that lost focus. A focused edit box may else leave the caret on the screen. */
this->nested_focus->Invalidate(this);
}
this->nested_focus = this->nested_array[widget_index];
return true;
} }
this->focused_widget = &this->widget[widget_index]; NOT_REACHED();
return true;
} }
/** /**