History

switch GLCanvas back to being owned by Application

ZappoMan committed 11 years ago

Commit a89691f1 parent e66f12f17 files · +93 −87Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+1−1
@@ -44,7 +44,7 @@ WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title · 43 unmodified lines
44}44}
45 45
46QScriptValue WindowScriptingInterface::hasFocus() {46QScriptValue WindowScriptingInterface::hasFocus() {
47 return DependencyManager::get<GLCanvas>()->hasFocus();47 return Application::getInstance()->getGLWidget()->hasFocus();
48}48}
49 49
50void WindowScriptingInterface::setFocus() {50void WindowScriptingInterface::setFocus() {