mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21760) -Fix (r20452): Restore wheeling of vertical scrollbars.

release/1.1
alberth 2011-01-09 15:36:02 +00:00
parent f5364269b5
commit 352fd000ea
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/window.cpp
View File

@ -442,7 +442,7 @@ static void DispatchHoverEvent(Window *w, int x, int y)
* @param nwid the widget where the scrollwheel was used * @param nwid the widget where the scrollwheel was used
* @param wheel scroll up or down * @param wheel scroll up or down
*/ */
static void DispatchMouseWheelEvent(Window *w, const NWidgetCore *nwid, int wheel) static void DispatchMouseWheelEvent(Window *w, NWidgetCore *nwid, int wheel)
{ {
if (nwid == NULL) return; if (nwid == NULL) return;
@ -452,6 +452,16 @@ static void DispatchMouseWheelEvent(Window *w, const NWidgetCore *nwid, int whee
return; return;
} }
/* Wheeling a vertical scrollbar. */
if (nwid->type == NWID_VSCROLLBAR) {
NWidgetScrollbar *sb = static_cast<NWidgetScrollbar *>(nwid);
if (sb->GetCount() > sb->GetCapacity()) {
sb->UpdatePosition(wheel);
w->SetDirty();
}
return;
}
/* Scroll the widget attached to the scrollbar. */ /* Scroll the widget attached to the scrollbar. */
Scrollbar *sb = (nwid->scrollbar_index >= 0 ? w->GetScrollbar(nwid->scrollbar_index) : NULL); Scrollbar *sb = (nwid->scrollbar_index >= 0 ? w->GetScrollbar(nwid->scrollbar_index) : NULL);
if (sb != NULL && sb->GetCount() > sb->GetCapacity()) { if (sb != NULL && sb->GetCount() > sb->GetCapacity()) {