mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-01 19:09:09 +00:00
Code Issues Activity

(svn r17375) -Codechange: remove last direct usage of scrollbar variables

Browse Source
This commit is contained in:
rubidium
2009-09-02 08:58:20 +00:00
parent 900aedf270
commit 5cb22df0f5
5 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/window.cpp
View File

@@ -452,12 +452,9 @@ static void DispatchMouseWheelEvent(Window *w, int widget, int wheel)
if (w->nested_array != NULL && (uint)widget < w->nested_array_size) sb = w->nested_array[widget]->FindScrollbar(w);
if (sb != NULL && sb->count > sb->cap) {
int pos = Clamp(sb->pos + wheel, 0, sb->count - sb->cap);
if (pos != sb->pos) {
sb->pos = pos;
w->SetDirty();
}
if (sb != NULL && sb->GetCount() > sb->GetCapacity()) {
sb->UpdatePosition(wheel);
w->SetDirty();
}
}
@@ -1886,9 +1883,9 @@ static bool HandleScrollbarScrolling()
}
/* Find the item we want to move to and make sure it's inside bounds. */
int pos = min(max(0, i + _scrollbar_start_pos) * sb->count / _scrollbar_size, max(0, sb->count - sb->cap));
if (pos != sb->pos) {
sb->pos = pos;
int pos = min(max(0, i + _scrollbar_start_pos) * sb->GetCount() / _scrollbar_size, max(0, sb->GetCount() - sb->GetCapacity()));
if (pos != sb->GetPosition()) {
sb->SetPosition(pos);
w->SetDirty();
}
return false;