History

More work on menus and some code cleanup

Brad Davis committed 11 years ago

Commit 1ff8c671 parent c0d562e21 files · +437 −512Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+9−4
@@ -45,13 +45,18 @@ QScriptValue WindowScriptingInterface::hasFocus() { · 44 unmodified lines
4545 }
4646
4747 void WindowScriptingInterface::setFocus() {
48− auto window = Application::getInstance()->getWindow();
49− window->activateWindow();
50− window->setFocus();
48+ Application::getInstance()->postLambdaEvent([] {
49+ auto window = Application::getInstance()->getWindow();
50+ window->activateWindow();
51+ window->setFocus();
52+ });
5153 }
5254
5355 void WindowScriptingInterface::raiseMainWindow() {
54−// Application::getInstance()->getWindow()->raise();
56+ // It's forbidden to call raise() from another thread.
57+ Application::getInstance()->postLambdaEvent([] {
58+ Application::getInstance()->getWindow()->raise();
59+ });
5560 }
5661
5762 void WindowScriptingInterface::setCursorVisible(bool visible) {