mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:56:43 +00:00
Code Issues Releases Wiki Activity

send mouse wheel input to active EditMode during drag operations

Browse source
This commit is contained in:
Marc Zinnschlag 2015-10-01 13:19:48 +02:00
parent 0a5bfb2107
commit 1d4f8b2595
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/render/editmode.cpp
View file

@ -59,3 +59,5 @@ void CSVRender::EditMode::drag (int diffX, int diffY) {}
void CSVRender::EditMode::dragCompleted() {} void CSVRender::EditMode::dragCompleted() {}
void CSVRender::EditMode::dragAborted() {} void CSVRender::EditMode::dragAborted() {}
void CSVRender::EditMode::dragWheel (int diff) {}

3
apps/opencs/view/render/editmode.hpp
View file

@ -71,6 +71,9 @@ namespace CSVRender
/// \note dragAborted will not be called, if the drag is aborted via changing /// \note dragAborted will not be called, if the drag is aborted via changing
/// editing mode /// editing mode
virtual void dragAborted(); virtual void dragAborted();
/// Default-implementation: ignored
virtual void dragWheel (int diff);
}; };
} }

2
apps/opencs/view/render/scenewidget.cpp
View file

@ -110,6 +110,8 @@ bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
keyPressEvent(static_cast<QKeyEvent*>(event)); keyPressEvent(static_cast<QKeyEvent*>(event));
if (event->type() == QEvent::KeyRelease) if (event->type() == QEvent::KeyRelease)
keyReleaseEvent(static_cast<QKeyEvent*>(event)); keyReleaseEvent(static_cast<QKeyEvent*>(event));
if (event->type() == QEvent::Wheel)
wheelEvent(static_cast<QWheelEvent *>(event));
// Always pass the event on to GLWidget, i.e. to OSG event queue // Always pass the event on to GLWidget, i.e. to OSG event queue
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);

10
apps/opencs/view/render/worldspacewidget.cpp
View file

@ -599,8 +599,14 @@ void CSVRender::WorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event)
void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event) void CSVRender::WorldspaceWidget::wheelEvent (QWheelEvent *event)
{ {
//if(!mMouse->wheelEvent(event)) if (mDragging)
RenderWidget::wheelEvent(event); {
EditMode& editMode = dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent());
editMode.dragWheel (event->delta());
}
RenderWidget::wheelEvent(event);
} }
void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event) void CSVRender::WorldspaceWidget::keyPressEvent (QKeyEvent *event)