mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r16317) -Codechange: Generalized finding a widget by type.

This commit is contained in:
alberth 2009-05-16 11:25:19 +00:00
parent c299a38e1f
commit db7e24e211
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/window.cpp
View File

@ -235,15 +235,15 @@ void Window::HandleButtonClick(byte widget)
}
/**
* Checks if the window has at least one widget of given type
* Return a widget of the requested type from the window.
* @param widget_type the widget type to look for
*/
bool Window::HasWidgetOfType(WidgetType widget_type) const
const Widget *Window::GetWidgetOfType(WidgetType widget_type) const
{
for (uint i = 0; i < this->widget_count; i++) {
if (this->widget[i].type == widget_type) return true;
if (this->widget[i].type == widget_type) return &this->widget[i];
}
return false;
return NULL;
}
static void StartWindowDrag(Window *w);
@ -822,7 +822,7 @@ void Window::Initialize(int x, int y, int min_width, int min_height,
/* Give focus to the opened window unless it is the OSK window or a text box
* of focused window has focus (so we don't interrupt typing). But if the new
* window has a text box, then take focus anyway. */
if (this->window_class != WC_OSK && (!EditBoxInGlobalFocus() || this->HasWidgetOfType(WWT_EDITBOX))) SetFocusedWindow(this);
if (this->window_class != WC_OSK && (!EditBoxInGlobalFocus() || this->GetWidgetOfType(WWT_EDITBOX) != NULL)) SetFocusedWindow(this);
/* Hacky way of specifying always-on-top windows. These windows are
* always above other windows because they are moved below them.
@ -1483,9 +1483,8 @@ static bool HandleWindowDragging()
}
/* Search for the title bar */
const Widget *t = w->widget;
while (t->type != WWT_CAPTION && t->type != WWT_LAST) t++;
assert(t->type == WWT_CAPTION);
const Widget *t = w->GetWidgetOfType(WWT_CAPTION);
assert(t != NULL);
/* The minimum number of pixels of the title bar must be visible
* in both the X or Y direction */

2
src/window_gui.h
View File

@ -376,7 +376,7 @@ public:
}
void HandleButtonClick(byte widget);
bool HasWidgetOfType(WidgetType widget_type) const;
const Widget *GetWidgetOfType(WidgetType widget_type) const;
void RaiseButtons();
void CDECL SetWidgetsDisabledState(bool disab_stat, int widgets, ...);