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

(svn r20460) -Codechange: Remove WF_SCROLL window flags and store the state directly in the scrollbar widget instead.

Browse Source
This commit is contained in:
frosch
2010-08-12 09:14:34 +00:00
parent 6e9c9c28d9
commit b37be47f16
4 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/window.cpp
View File

@@ -1380,9 +1380,15 @@ static void DecreaseWindowCounters()
Window *w;
FOR_ALL_WINDOWS_FROM_FRONT(w) {
/* Unclick scrollbar buttons if they are pressed. */
if (w->flags4 & (WF_SCROLL_DOWN | WF_SCROLL_UP)) {
w->flags4 &= ~(WF_SCROLL_DOWN | WF_SCROLL_UP);
w->SetDirty();
for (uint i = 0; i < w->nested_array_size; i++) {
NWidgetBase *nwid = w->nested_array[i];
if (nwid != NULL && (nwid->type == WWT_HSCROLLBAR || nwid->type == WWT_SCROLLBAR || nwid->type == WWT_SCROLL2BAR)) {
NWidgetScrollbar *sb = static_cast<NWidgetScrollbar*>(nwid);
if (sb->disp_flags & (ND_SCROLLBAR_UP | ND_SCROLLBAR_DOWN)) {
sb->disp_flags &= ~(ND_SCROLLBAR_UP | ND_SCROLLBAR_DOWN);
sb->SetDirty(w);
}
}
}
w->OnMouseLoop();
}
@@ -1831,14 +1837,12 @@ static EventState HandleScrollbarScrolling()
}
int i;
Scrollbar *sb = w->GetScrollbar(w->scrolling_scrollbar);
NWidgetScrollbar *sb = w->GetWidget<NWidgetScrollbar>(w->scrolling_scrollbar);
bool rtl = false;
if (w->flags4 & WF_HSCROLL) {
if (sb->type == WWT_HSCROLLBAR) {
i = _cursor.pos.x - _cursorpos_drag_start.x;
rtl = _dynlang.text_dir == TD_RTL;
} else if (w->flags4 & WF_SCROLL2) {
i = _cursor.pos.y - _cursorpos_drag_start.y;
} else {
i = _cursor.pos.y - _cursorpos_drag_start.y;
}