History

expose domain connection error to Window

Wayne Chen committed 8 years ago

Commit 0f257561 parent 07bda906 files · +20 −12Browse files

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

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+7−0
@@ -39,6 +39,9 @@ WindowScriptingInterface::WindowScriptingInterface() { · 38 unmodified lines
39 connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &WindowScriptingInterface::disconnectedFromDomain);39 connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, &WindowScriptingInterface::disconnectedFromDomain);
40 40
41 connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);41 connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
42 connect(&domainHandler, &DomainHandler::domainConnectionErrorChanged, this, [this](int reasonCode) {
43 _lastDomainConnectionError = reasonCode;
44 });
42 45
43 connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {46 connect(qApp, &Application::svoImportRequested, [this](const QString& urlString) {
44 static const QMetaMethod svoImportRequestedSignal =47 static const QMetaMethod svoImportRequestedSignal =
@@ -409,6 +412,10 @@ glm::vec2 WindowScriptingInterface::getDeviceSize() const { · 364 unmodified lines
409 return qApp->getDeviceSize();412 return qApp->getDeviceSize();
410}413}
411 414
415int WindowScriptingInterface::getLastDominConnectionError() const {
416 return DependencyManager::get<NodeList>()->getDomainHandler().getLastDomainConnectionError();
417}
418
412int WindowScriptingInterface::getX() {419int WindowScriptingInterface::getX() {
413 return qApp->getWindow()->geometry().x();420 return qApp->getWindow()->geometry().x();
414}421}