History

Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains

Seth Alves committed 8 years ago

Commit 4033af92 parents 585a523 f5f4e2a33 files · +411 −134Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 33 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+2−4
@@ -74,16 +74,14 @@ QScriptValue WindowScriptingInterface::hasFocus() { · 73 unmodified lines
7474 void WindowScriptingInterface::setFocus() {
7575 // It's forbidden to call focus() from another thread.
7676 qApp->postLambdaEvent([] {
77− auto window = qApp->getWindow();
78− window->activateWindow();
79− window->setFocus();
77+ qApp->setFocus();
8078 });
8179 }
8280
8381 void WindowScriptingInterface::raiseMainWindow() {
8482 // It's forbidden to call raise() from another thread.
8583 qApp->postLambdaEvent([] {
86− qApp->getWindow()->raise();
84+ qApp->raise();
8785 });
8886 }
8987