From b0361025b0df025594924281545d33b94d72e848 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 21 Aug 2014 14:32:38 -0700
Subject: [PATCH] Remove custom behavior from running scripts widget

---
 interface/src/Application.cpp             | 15 +++++++++------
 interface/src/ui/RunningScriptsWidget.cpp | 15 +++++++++------
 interface/src/ui/RunningScriptsWidget.h   |  3 +--
 interface/ui/runningScriptsWidget.ui      | 10 ++++++++--
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 11729eef90..4be2e689b8 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3850,14 +3850,17 @@ void Application::manageRunningScriptsWidgetVisibility(bool shown) {
 }
 
 void Application::toggleRunningScriptsWidget() {
-    if (_runningScriptsWidgetWasVisible) {
-        _runningScriptsWidget->hide();
-        _runningScriptsWidgetWasVisible = false;
+    if (_runningScriptsWidget->isVisible()) {
+        if (_runningScriptsWidget->hasFocus()) {
+            _runningScriptsWidget->hide();
+        } else {
+            _runningScriptsWidget->raise();
+            setActiveWindow(_runningScriptsWidget);
+            _runningScriptsWidget->setFocus();
+        }
     } else {
-        _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(),
-                                                 _window->size()));
         _runningScriptsWidget->show();
-        _runningScriptsWidgetWasVisible = true;
+        _runningScriptsWidget->setFocus();
     }
 }
 
diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index 5bcb1a85de..38298643a3 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -24,7 +24,7 @@
 #include "ScriptsModel.h"
 
 RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
-    FramelessDialog(parent, 0, POSITION_LEFT),
+    QWidget(parent, Qt::Window),
     ui(new Ui::RunningScriptsWidget),
     _signalMapper(this),
     _proxyModel(this),
@@ -33,8 +33,6 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
 
     setAttribute(Qt::WA_DeleteOnClose, false);
 
-    setAllowResize(false);
-
     ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
     ui->reloadAllButton->setIcon(QIcon(Application::resourcesPath() + "images/reload.svg"));
     ui->stopAllButton->setIcon(QIcon(Application::resourcesPath() + "images/stop.svg"));
@@ -143,6 +141,8 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
         line->setFrameShape(QFrame::HLine);
         line->setStyleSheet("color: #E1E1E1; margin-left: 6px; margin-right: 6px;");
 
+        row->setStyleSheet("background: #f7f7f7;");
+
         ui->scrollAreaWidgetContents->layout()->addWidget(row);
         ui->scrollAreaWidgetContents->layout()->addWidget(line);
     }
@@ -163,7 +163,10 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) {
         ui->filterLineEdit->setFocus();
     }
 
-    FramelessDialog::showEvent(event);
+    const QRect parentGeometry = parentWidget()->geometry();
+    setGeometry(parentGeometry.topLeft().x(), parentGeometry.topLeft().y(), size().width(), parentWidget()->size().height());
+
+    QWidget::showEvent(event);
 }
 
 void RunningScriptsWidget::selectFirstInList() {
@@ -189,14 +192,14 @@ bool RunningScriptsWidget::eventFilter(QObject* sender, QEvent* event) {
         return false;
     }
 
-    return FramelessDialog::eventFilter(sender, event);
+    return QWidget::eventFilter(sender, event);
 }
 
 void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) {
     if (keyEvent->key() == Qt::Key_Escape) {
         return;
     } else {
-        FramelessDialog::keyPressEvent(keyEvent);
+        QWidget::keyPressEvent(keyEvent);
     }
 }
 
diff --git a/interface/src/ui/RunningScriptsWidget.h b/interface/src/ui/RunningScriptsWidget.h
index 6810aca487..7493a1a5ce 100644
--- a/interface/src/ui/RunningScriptsWidget.h
+++ b/interface/src/ui/RunningScriptsWidget.h
@@ -25,8 +25,7 @@ namespace Ui {
     class RunningScriptsWidget;
 }
 
-class RunningScriptsWidget : public FramelessDialog
-{
+class RunningScriptsWidget : public QWidget {
     Q_OBJECT
 public:
     explicit RunningScriptsWidget(QWidget* parent = NULL);
diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui
index b58c8436d0..42d4813021 100644
--- a/interface/ui/runningScriptsWidget.ui
+++ b/interface/ui/runningScriptsWidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>324</width>
-    <height>971</height>
+    <height>643</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <string notr="true">* {
 	font-family: Helvetica, Arial, sans-serif;
 }
-QWidget {
+#RunningScriptsWidget {
 	background: #f7f7f7; 
 }</string>
   </property>
@@ -326,6 +326,11 @@ padding-top: 3px;</string>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
+        <property name="styleSheet">
+         <string notr="true">#runningScriptsList {
+	background: #f7f7f7; 
+}</string>
+        </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
@@ -608,6 +613,7 @@ background-color: white;</string>
        <widget class="QListView" name="scriptListView">
         <property name="styleSheet">
          <string notr="true">QListView {
+	background: #f7f7f7; 
 	border: 1px solid rgb(128, 128, 128);
 	border-radius: 2px;
 }