Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18272) -Codechange: make FindScrollbar a const function

Browse Source
This commit is contained in:
rubidium 2009-11-24 16:54:52 +00:00
parent 9cc710ad22
commit 5669e483c5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widget.cpp
View File

@ -848,7 +848,7 @@ NWidgetCore *NWidgetCore::GetWidgetFromPos(int x, int y)
} }
/** /**
* @fn Scrollbar *NWidgetCore::FindScrollbar(Window *w, bool allow_next = true) * @fn Scrollbar *NWidgetCore::FindScrollbar(Window *w, bool allow_next = true) const
* Find the scrollbar of the widget through the Window::nested_array. * Find the scrollbar of the widget through the Window::nested_array.
* @param w Window containing the widgets and the scrollbar, * @param w Window containing the widgets and the scrollbar,
* @param allow_next Search may be extended to the next widget. * @param allow_next Search may be extended to the next widget.
@ -1587,10 +1587,10 @@ NWidgetCore *NWidgetBackground::GetWidgetFromPos(int x, int y)
return nwid; return nwid;
} }
Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) Scrollbar *NWidgetBackground::FindScrollbar(Window *w, bool allow_next) const
{ {
if (this->index > 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) { if (this->index > 0 && allow_next && this->child == NULL && (uint)(this->index) + 1 < w->nested_array_size) {
NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1); const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1);
if (next_wid != NULL) return next_wid->FindScrollbar(w, false); if (next_wid != NULL) return next_wid->FindScrollbar(w, false);
} }
return NULL; return NULL;
@ -1637,7 +1637,7 @@ void NWidgetViewport::Draw(const Window *w)
} }
} }
Scrollbar *NWidgetViewport::FindScrollbar(Window *w, bool allow_next) Scrollbar *NWidgetViewport::FindScrollbar(Window *w, bool allow_next) const
{ {
return NULL; return NULL;
} }
@ -2053,13 +2053,13 @@ void NWidgetLeaf::Draw(const Window *w)
} }
} }
Scrollbar *NWidgetLeaf::FindScrollbar(Window *w, bool allow_next) Scrollbar *NWidgetLeaf::FindScrollbar(Window *w, bool allow_next) const
{ {
if (this->type == WWT_SCROLLBAR) return &w->vscroll; if (this->type == WWT_SCROLLBAR) return &w->vscroll;
if (this->type == WWT_SCROLL2BAR) return &w->vscroll2; if (this->type == WWT_SCROLL2BAR) return &w->vscroll2;
if (this->index > 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) { if (this->index > 0 && allow_next && (uint)(this->index) + 1 < w->nested_array_size) {
NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1); const NWidgetCore *next_wid = w->GetWidget<NWidgetCore>(this->index + 1);
if (next_wid != NULL) return next_wid->FindScrollbar(w, false); if (next_wid != NULL) return next_wid->FindScrollbar(w, false);
} }
return NULL; return NULL;

8
src/widget_type.h
View File

@ -251,7 +251,7 @@ public:
/* virtual */ void FillNestedArray(NWidgetBase **array, uint length); /* virtual */ void FillNestedArray(NWidgetBase **array, uint length);
/* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y);
virtual Scrollbar *FindScrollbar(Window *w, bool allow_next = true) = 0; virtual Scrollbar *FindScrollbar(Window *w, bool allow_next = true) const = 0;
NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget. NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget.
Colours colour; ///< Colour of this widget. Colours colour; ///< Colour of this widget.
@ -428,7 +428,7 @@ public:
/* virtual */ void Draw(const Window *w); /* virtual */ void Draw(const Window *w);
/* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y);
/* virtual */ NWidgetBase *GetWidgetOfType(WidgetType tp); /* virtual */ NWidgetBase *GetWidgetOfType(WidgetType tp);
/* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true); /* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true) const;
private: private:
NWidgetPIPContainer *child; ///< Child widget. NWidgetPIPContainer *child; ///< Child widget.
@ -448,7 +448,7 @@ public:
/* virtual */ void SetupSmallestSize(Window *w, bool init_array); /* virtual */ void SetupSmallestSize(Window *w, bool init_array);
/* virtual */ void Draw(const Window *w); /* virtual */ void Draw(const Window *w);
/* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true); /* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true) const;
void InitializeViewport(Window *w, uint32 follow_flags, ZoomLevel zoom); void InitializeViewport(Window *w, uint32 follow_flags, ZoomLevel zoom);
void UpdateViewportCoordinates(Window *w); void UpdateViewportCoordinates(Window *w);
@ -462,7 +462,7 @@ public:
/* virtual */ void SetupSmallestSize(Window *w, bool init_array); /* virtual */ void SetupSmallestSize(Window *w, bool init_array);
/* virtual */ void Draw(const Window *w); /* virtual */ void Draw(const Window *w);
/* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true); /* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true) const;
bool ButtonHit(const Point &pt); bool ButtonHit(const Point &pt);