From dc3453a878ee719c0a00008e5417342abd27ad1c Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 13 Mar 2015 14:10:46 -0700
Subject: [PATCH] Add Window.raiseMainWindow()

---
 examples/edit.js                                     | 2 ++
 interface/src/scripting/WindowScriptingInterface.cpp | 9 +++++++--
 interface/src/scripting/WindowScriptingInterface.h   | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/examples/edit.js b/examples/edit.js
index 9ce8561ab0..0402b8d42b 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -865,6 +865,8 @@ function importSVO(importURL) {
         if (isActive) {
             selectionManager.setSelections(pastedEntityIDs);
         }
+
+        Window.raiseMainWindow();
     } else {
         Window.alert("There was an error importing the entity file.");
     }
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index 4a6afe4dbe..7f4b5ddf45 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -44,8 +44,13 @@ QScriptValue WindowScriptingInterface::hasFocus() {
 }
 
 void WindowScriptingInterface::setFocus() {
-    Application::getInstance()->getWindow()->activateWindow();
-    Application::getInstance()->getWindow()->setFocus();
+    auto window = Application::getInstance()->getWindow();
+    window->activateWindow();
+    window->setFocus();
+}
+
+void WindowScriptingInterface::raiseMainWindow() {
+    Application::getInstance()->getWindow()->raise();
 }
 
 void WindowScriptingInterface::setCursorVisible(bool visible) {
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index e3af898267..6a812f14e3 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -43,6 +43,7 @@ public slots:
     void setCursorVisible(bool visible);
     QScriptValue hasFocus();
     void setFocus();
+    void raiseMainWindow();
     QScriptValue alert(const QString& message = "");
     QScriptValue confirm(const QString& message = "");
     QScriptValue form(const QString& title, QScriptValue array);