1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 18:37:08 +00:00

Merge remote-tracking branch 'aesylwinn/FixTracking'

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

View File

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

View File

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