dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
alberth
2009-05-30 12:41:53 +00:00
parent c9e3d041fb
commit 3e78641156
2 changed files with 13 additions and 14 deletions
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)
{
bool focused_widget_changed = false;
int widget = 0;
if (w->desc_flags & WDF_DEF_WIDGET) {
widget = GetWidgetFromPos(w, x, y);
bool focused_widget_changed = false;
/* If clicked on a window that previously did dot have focus */
if (_focused_window != w &&
(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);
}
if (w->focused_widget != wi) {
/* 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;
}
focused_widget_changed = w->SetFocusedWidget(widget);
}
if (wi->type & WWB_PUSHBUTTON) {