From c20381a0eafb8ead7797a1e828774afffce2643e Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Wed, 30 Apr 2014 08:24:04 +0200
Subject: [PATCH] EditorWindow on-top behavior fixed

---
 interface/src/ui/ScriptEditorWidget.cpp | 2 +-
 interface/src/ui/ScriptEditorWindow.cpp | 3 ++-
 interface/src/ui/ScriptEditorWindow.h   | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/src/ui/ScriptEditorWidget.cpp b/interface/src/ui/ScriptEditorWidget.cpp
index 08a68b1d8c..33e014ac07 100644
--- a/interface/src/ui/ScriptEditorWidget.cpp
+++ b/interface/src/ui/ScriptEditorWidget.cpp
@@ -126,7 +126,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) {
         loop.exec();
         _scriptEditorWidgetUI->scriptEdit->setPlainText(reply->readAll());
         if (!saveAs()) {
-            emit static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->terminateCurrentTab();
+            static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->terminateCurrentTab();
         }
     }
 
diff --git a/interface/src/ui/ScriptEditorWindow.cpp b/interface/src/ui/ScriptEditorWindow.cpp
index 9f90606f5b..ec5070ac20 100644
--- a/interface/src/ui/ScriptEditorWindow.cpp
+++ b/interface/src/ui/ScriptEditorWindow.cpp
@@ -34,7 +34,7 @@ ScriptEditorWindow::ScriptEditorWindow() :
     _saveMenu(new QMenu)
 {
     _ScriptEditorWindowUI->setupUi(this);
-    this->setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
+    this->setWindowFlags(Qt::Tool);
     show();
     addScriptEditorWidget("New script");
     connect(_loadMenu, SIGNAL(aboutToShow()), this, SLOT(loadMenuAboutToShow()));
@@ -206,5 +206,6 @@ void ScriptEditorWindow::updateScriptNameOrStatus() {
 void ScriptEditorWindow::terminateCurrentTab() {
     if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
         _ScriptEditorWindowUI->tabWidget->removeTab(_ScriptEditorWindowUI->tabWidget->currentIndex());
+        this->raise();
     }
 }
diff --git a/interface/src/ui/ScriptEditorWindow.h b/interface/src/ui/ScriptEditorWindow.h
index c934e44073..360e902cc2 100644
--- a/interface/src/ui/ScriptEditorWindow.h
+++ b/interface/src/ui/ScriptEditorWindow.h
@@ -25,6 +25,8 @@ public:
     ScriptEditorWindow();
     ~ScriptEditorWindow();
 
+    void terminateCurrentTab();
+
 protected:
     void closeEvent(QCloseEvent* event);
 
@@ -37,9 +39,6 @@ private:
     void setRunningState(bool run);
     void setScriptName(const QString& scriptName);
 
-public slots:
-    void terminateCurrentTab();
-
 private slots:
     void loadScriptMenu(const QString& scriptName);
     void loadScriptClicked();