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 r21977) -Codechange: Always cal Window::OnMouseWheel(), independent of viewport scroll/zoom settings.

Browse Source
This commit is contained in:
frosch 2011-02-05 16:36:37 +00:00
parent b992a93996
commit 9e1695aa1e
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main_gui.cpp
View File

@ -421,7 +421,9 @@ struct MainWindow : Window
virtual void OnMouseWheel(int wheel) virtual void OnMouseWheel(int wheel)
{ {
ZoomInOrOutToCursorWindow(wheel < 0, this); if (_settings_client.gui.scrollwheel_scrolling == 0) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
} }
virtual void OnResize() virtual void OnResize()

14
src/smallmap_gui.cpp
View File

@ -1461,12 +1461,14 @@ public:
virtual void OnMouseWheel(int wheel) virtual void OnMouseWheel(int wheel)
{ {
const NWidgetBase *wid = this->GetWidget<NWidgetBase>(SM_WIDGET_MAP); if (_settings_client.gui.scrollwheel_scrolling == 0) {
int cursor_x = _cursor.pos.x - this->left - wid->pos_x; const NWidgetBase *wid = this->GetWidget<NWidgetBase>(SM_WIDGET_MAP);
int cursor_y = _cursor.pos.y - this->top - wid->pos_y; int cursor_x = _cursor.pos.x - this->left - wid->pos_x;
if (IsInsideMM(cursor_x, 0, wid->current_x) && IsInsideMM(cursor_y, 0, wid->current_y)) { int cursor_y = _cursor.pos.y - this->top - wid->pos_y;
Point pt = {cursor_x, cursor_y}; if (IsInsideMM(cursor_x, 0, wid->current_x) && IsInsideMM(cursor_y, 0, wid->current_y)) {
this->SetZoomLevel((wheel < 0) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt); Point pt = {cursor_x, cursor_y};
this->SetZoomLevel((wheel < 0) ? ZLC_ZOOM_IN : ZLC_ZOOM_OUT, &pt);
}
} }
} }

4
src/viewport_gui.cpp
View File

@ -143,7 +143,9 @@ public:
virtual void OnMouseWheel(int wheel) virtual void OnMouseWheel(int wheel)
{ {
ZoomInOrOutToCursorWindow(wheel < 0, this); if (_settings_client.gui.scrollwheel_scrolling == 0) {
ZoomInOrOutToCursorWindow(wheel < 0, this);
}
} }
virtual void OnInvalidateData(int data = 0) virtual void OnInvalidateData(int data = 0)

6
src/window.cpp
View File

@ -2184,10 +2184,8 @@ static void MouseLoop(MouseClick click, int mousewheel)
if (vp != NULL && (_game_mode == GM_MENU || IsGeneratingWorld())) return; if (vp != NULL && (_game_mode == GM_MENU || IsGeneratingWorld())) return;
if (mousewheel != 0) { if (mousewheel != 0) {
if (_settings_client.gui.scrollwheel_scrolling == 0) { /* Send mousewheel event to window */
/* Send mousewheel event to window */ w->OnMouseWheel(mousewheel);
w->OnMouseWheel(mousewheel);
}
/* Dispatch a MouseWheelEvent for widgets if it is not a viewport */ /* Dispatch a MouseWheelEvent for widgets if it is not a viewport */
if (vp == NULL) DispatchMouseWheelEvent(w, w->nested_root->GetWidgetFromPos(x - w->left, y - w->top), mousewheel); if (vp == NULL) DispatchMouseWheelEvent(w, w->nested_root->GetWidgetFromPos(x - w->left, y - w->top), mousewheel);