gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13346) -Fix (r13322): scrolling the main viewport with keyboard when having a build tool selected failed.

Browse Source
This commit is contained in:
rubidium 2008-05-30 21:06:43 +00:00
parent 5a6f6bf067
commit 3d75eb446d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/window.cpp
View File

@ -1796,14 +1796,12 @@ static const int8 scrollamt[16][2] = {
{ 0, 0}, ///< 15 : left + up + right + down = nothing { 0, 0}, ///< 15 : left + up + right + down = nothing
}; };
static bool HandleKeyScrolling() static void HandleKeyScrolling()
{ {
if (_dirkeys && !_no_scroll) { if (_dirkeys && !_no_scroll) {
int factor = _shift_pressed ? 50 : 10; int factor = _shift_pressed ? 50 : 10;
ScrollMainViewport(scrollamt[_dirkeys][0] * factor, scrollamt[_dirkeys][1] * factor); ScrollMainViewport(scrollamt[_dirkeys][0] * factor, scrollamt[_dirkeys][1] * factor);
return false;
} }
return true;
} }
void MouseLoop(MouseClick click, int mousewheel) void MouseLoop(MouseClick click, int mousewheel)
@ -1811,13 +1809,14 @@ void MouseLoop(MouseClick click, int mousewheel)
DecreaseWindowCounters(); DecreaseWindowCounters();
HandlePlacePresize(); HandlePlacePresize();
UpdateTileSelection(); UpdateTileSelection();
HandleKeyScrolling();
if (!VpHandlePlaceSizingDrag()) return; if (!VpHandlePlaceSizingDrag()) return;
if (!HandleDragDrop()) return; if (!HandleDragDrop()) return;
if (!HandleWindowDragging()) return; if (!HandleWindowDragging()) return;
if (!HandleScrollbarScrolling()) return; if (!HandleScrollbarScrolling()) return;
if (!HandleViewportScroll()) return; if (!HandleViewportScroll()) return;
if (!HandleMouseOver()) return; if (!HandleMouseOver()) return;
if (!HandleKeyScrolling()) return;
bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0); bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return; if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return;