teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote-tracking branch 'aesylwinn/FixTracking'

Browse source
This commit is contained in:
Marc Zinnschlag 2016-06-08 09:23:35 +02:00
commit 447ba08be5
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,6 +173,9 @@ SceneWidget::SceneWidget(boost::shared_ptr<Resource::ResourceSystem> resourceSys
mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem); mResourceSystem->getSceneManager()->setParticleSystemMask(Mask_ParticleSystem);
// Recieve mouse move event even if mouse button is not pressed
setMouseTracking(true);
/// \todo make shortcut configurable /// \todo make shortcut configurable
QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut); QShortcut *focusToolbar = new QShortcut (Qt::Key_T, this, 0, 0, Qt::WidgetWithChildrenShortcut);
connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest())); connect (focusToolbar, SIGNAL (activated()), this, SIGNAL (focusToolbarRequest()));

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

@ -646,8 +646,11 @@ void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
mToolTipPos = event->globalPos(); mToolTipPos = event->globalPos();
if (mShowToolTips) if (mShowToolTips)
{
QToolTip::hideText();
mToolTipDelayTimer.start (mToolTipDelay); mToolTipDelayTimer.start (mToolTipDelay);
} }
}
SceneWidget::mouseMoveEvent(event); SceneWidget::mouseMoveEvent(event);
} }