From 0c5a97841185dd5db6728116db07f86c96a84a89 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 26 Nov 2014 10:53:38 -0800 Subject: [PATCH] fix crash in activateWindowAfterEnterMode in no oculus case --- interface/src/ui/HMDToolsDialog.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/HMDToolsDialog.cpp b/interface/src/ui/HMDToolsDialog.cpp index 141b0d61ad..9a409b17f1 100644 --- a/interface/src/ui/HMDToolsDialog.cpp +++ b/interface/src/ui/HMDToolsDialog.cpp @@ -126,9 +126,9 @@ void HMDToolsDialog::enterModeClicked(bool checked) { void HMDToolsDialog::activateWindowAfterEnterMode() { Application::getInstance()->getWindow()->activateWindow(); - QWindow* mainWindow = Application::getInstance()->getWindow()->windowHandle(); - QPoint windowCenter = mainWindow->geometry().center(); - QCursor::setPos(_hmdScreen, windowCenter); + + // center the cursor on the main application window + centerCursorOnWidget(Application::getInstance()->getWindow()); } @@ -178,10 +178,12 @@ void HMDToolsDialog::centerCursorOnWidget(QWidget* widget) { } void HMDToolsDialog::showEvent(QShowEvent* event) { + // center the cursor on the hmd tools dialog centerCursorOnWidget(this); } void HMDToolsDialog::hideEvent(QHideEvent* event) { + // center the cursor on the main application window centerCursorOnWidget(Application::getInstance()->getWindow()); }