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

(svn r20459) -Codechange: Remove the Scrollbar members of Window and make NWidgetScrollbar inherit from Scrollbar instead.

Browse Source
This commit is contained in:
frosch
2010-08-12 09:13:04 +00:00
parent 92c34da796
commit b98eba0fb2
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/widget.cpp
View File

@@ -75,7 +75,7 @@ static void ScrollbarClickPositioning(Window *w, NWidgetScrollbar *nw, int x, in
{
int pos;
bool rtl = false;
Scrollbar *sb = nw->GetScrollbar(w);
Scrollbar *sb = nw;
switch (nw->type) {
case WWT_SCROLLBAR:
@@ -1670,7 +1670,7 @@ void Scrollbar::SetCapacityFromWidget(Window *w, int widget, int padding)
* @param colour Colour of the scrollbar.
* @param index Index in the widget array used by the window system.
*/
NWidgetScrollbar::NWidgetScrollbar(WidgetType tp, Colours colour, int index) : NWidgetCore(tp, colour, 1, 1, 0x0, STR_NULL)
NWidgetScrollbar::NWidgetScrollbar(WidgetType tp, Colours colour, int index) : NWidgetCore(tp, colour, 1, 1, 0x0, STR_NULL), Scrollbar(tp != WWT_HSCROLLBAR)
{
assert(tp == WWT_HSCROLLBAR || tp == WWT_SCROLLBAR || tp == WWT_SCROLL2BAR);
this->SetIndex(index);
@@ -1722,21 +1722,21 @@ void NWidgetScrollbar::Draw(const Window *w)
case WWT_HSCROLLBAR:
DrawHorizontalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL)) == (WF_SCROLL_UP | WF_HSCROLL),
w->scrolling_scrollbar == this->index,
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL), this->GetScrollbar(w));
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL), this);
break;
case WWT_SCROLLBAR:
assert(this->widget_data == 0);
DrawVerticalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_UP,
w->scrolling_scrollbar == this->index,
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN, this->GetScrollbar(w));
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN, this);
break;
case WWT_SCROLL2BAR:
assert(this->widget_data == 0);
DrawVerticalScrollbar(r, this->colour, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_UP | WF_SCROLL2),
w->scrolling_scrollbar == this->index,
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2), this->GetScrollbar(w));
(w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2), this);
break;
default: NOT_REACHED();
@@ -1747,26 +1747,6 @@ void NWidgetScrollbar::Draw(const Window *w)
}
}
const Scrollbar *NWidgetScrollbar::GetScrollbar(const Window *w) const
{
switch (this->type) {
case WWT_HSCROLLBAR: return &w->old_hscroll;
case WWT_SCROLLBAR: return &w->old_vscroll;
case WWT_SCROLL2BAR: return &w->old_vscroll2;
default: NOT_REACHED();
}
}
Scrollbar *NWidgetScrollbar::GetScrollbar(Window *w) const
{
switch (this->type) {
case WWT_HSCROLLBAR: return &w->old_hscroll;
case WWT_SCROLLBAR: return &w->old_vscroll;
case WWT_SCROLL2BAR: return &w->old_vscroll2;
default: NOT_REACHED();
}
}
/** Reset the cached dimensions. */
/* static */ void NWidgetLeaf::InvalidateDimensionCache()
{