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

(svn r16467) -Codechange: Unduplicate setting of widget focus (with thanks to Smatz).

release/1.0
alberth 2009-05-30 12:41:53 +00:00
parent bfaf610fff
commit 101a6b3320
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.cpp
View File

@ -249,11 +249,11 @@ static void StartWindowSizing(Window *w, bool to_left);
*/ */
static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click) static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click)
{ {
bool focused_widget_changed = false;
int widget = 0; int widget = 0;
if (w->desc_flags & WDF_DEF_WIDGET) { if (w->desc_flags & WDF_DEF_WIDGET) {
widget = GetWidgetFromPos(w, x, y); widget = GetWidgetFromPos(w, x, y);
bool focused_widget_changed = false;
/* If clicked on a window that previously did dot have focus */ /* If clicked on a window that previously did dot have focus */
if (_focused_window != w && if (_focused_window != w &&
(w->desc_flags & WDF_NO_FOCUS) == 0 && // Don't lose focus to toolbars (w->desc_flags & WDF_NO_FOCUS) == 0 && // Don't lose focus to toolbars
@ -286,12 +286,7 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click)
DeleteWindowById(WC_OSK, 0); DeleteWindowById(WC_OSK, 0);
} }
if (w->focused_widget != wi) { focused_widget_changed = w->SetFocusedWidget(widget);
/* Repaint the widget that lost focus. A focused edit box may else leave the caret on the screen. */
if (w->focused_widget != NULL) w->InvalidateWidget(w->focused_widget - w->widget);
focused_widget_changed = true;
w->focused_widget = wi;
}
} }
if (wi->type & WWB_PUSHBUTTON) { if (wi->type & WWB_PUSHBUTTON) {

18
src/window_gui.h
View File

@ -266,16 +266,20 @@ public:
/** /**
* Set focus within this window to the given widget. The function however doesn't change which window has focus. * Set focus within this window to the given widget. The function however doesn't change which window has focus.
* @param widget_index Index of the widget in the window to set the focus to. * @param widget_index Index of the widget in the window to set the focus to.
* @return Focus has changed.
*/ */
inline void SetFocusedWidget(byte widget_index) inline bool SetFocusedWidget(byte widget_index)
{ {
if (widget_index < this->widget_count) { if (widget_index >= this->widget_count || this->widget + widget_index == this->focused_widget) {
/* Repaint the widget that lost focus. A focused edit box may else leave the caret on the screen. */ return false;
if (this->focused_widget != NULL && this->focused_widget - this->widget != widget_index) {
this->InvalidateWidget(this->focused_widget - this->widget);
}
this->focused_widget = &this->widget[widget_index];
} }
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;
} }
/** /**