From 225c02251156dead14e596f5d36dfed9c422f5d8 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 25 Apr 2014 10:10:50 -0700
Subject: [PATCH] Update RunningScriptsWidget to use FramelessDialog

---
 interface/src/Application.cpp             | 13 ++-----------
 interface/src/ui/RunningScriptsWidget.cpp |  9 ++++-----
 interface/src/ui/RunningScriptsWidget.h   |  6 ++----
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 30791a29b4..e812116487 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -164,7 +164,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _bytesPerSecond(0),
         _previousScriptLocation(),
         _logger(new FileLogger(this)),
-        _runningScriptsWidget(new RunningScriptsWidget),
+        _runningScriptsWidget(new RunningScriptsWidget(_window)),
         _runningScriptsWidgetWasVisible(false)
 {
     // init GnuTLS for DTLS with domain-servers
@@ -332,7 +332,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree());
     LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard);
 
-    _window->addDockWidget(Qt::NoDockWidgetArea, _runningScriptsWidget);
     _runningScriptsWidget->setRunningScripts(getRunningScripts());
     connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript);
 
@@ -356,7 +355,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     connect(_window, &MainWindow::windowGeometryChanged,
             _runningScriptsWidget, &RunningScriptsWidget::setBoundary);
-    connect(_window, &MainWindow::windowShown, this, &Application::manageRunningScriptsWidgetVisibility);
 
     //When -url in command line, teleport to location
     urlGoTo(argc, constArgv);
@@ -705,11 +703,6 @@ void Application::resizeGL(int width, int height) {
     updateProjectionMatrix();
     glLoadIdentity();
 
-    if (_runningScriptsWidgetWasVisible) {
-        _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
-                                           _window->geometry().topLeft().y(),
-                                           _runningScriptsWidget->width(), _window->height());
-    }
     // update Stats width
     int horizontalOffset = 0;
     if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
@@ -3350,15 +3343,13 @@ void Application::manageRunningScriptsWidgetVisibility(bool shown)
 
 void Application::toggleRunningScriptsWidget()
 {
+    qDebug() << "RS";
     if (_runningScriptsWidgetWasVisible) {
         _runningScriptsWidget->hide();
         _runningScriptsWidgetWasVisible = false;
     } else {
         _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(),
                                                  _window->size()));
-        _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
-                                           _window->geometry().topLeft().y(),
-                                           _runningScriptsWidget->width(), _window->height());
         _runningScriptsWidget->show();
         _runningScriptsWidgetWasVisible = true;
     }
diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index 602721227d..bc2a27afaf 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -20,14 +20,13 @@
 #include "Application.h"
 
 RunningScriptsWidget::RunningScriptsWidget(QWidget *parent) :
-    QDockWidget(parent),
+    FramelessDialog(parent, 0, POSITION_LEFT),
     ui(new Ui::RunningScriptsWidget),
     _mousePressed(false),
     _mousePosition(QPoint())
 {
     ui->setupUi(this);
 
-    setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint);
 
     ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
     ui->reloadAllButton->setIcon(QIcon(Application::resourcesPath() + "images/reload.svg"));
@@ -114,7 +113,7 @@ void RunningScriptsWidget::mousePressEvent(QMouseEvent *e)
         _mousePressed = false;
         _mousePosition = QPoint();
     }
-    QWidget::mousePressEvent(e);
+    FramelessDialog::mousePressEvent(e);
 }
 
 void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
@@ -126,7 +125,7 @@ void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
             move(newPosition.x(), _boundary.y());
         }
     }
-    QWidget::mouseMoveEvent(e);
+    FramelessDialog::mouseMoveEvent(e);
 }
 
 void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
@@ -201,7 +200,7 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
         break;
     }
 
-    QWidget::keyPressEvent(e);
+    FramelessDialog::keyPressEvent(e);
 }
 
 void RunningScriptsWidget::paintEvent(QPaintEvent *)
diff --git a/interface/src/ui/RunningScriptsWidget.h b/interface/src/ui/RunningScriptsWidget.h
index 72f284fd2d..a4ee2fe57f 100644
--- a/interface/src/ui/RunningScriptsWidget.h
+++ b/interface/src/ui/RunningScriptsWidget.h
@@ -12,16 +12,14 @@
 #ifndef hifi_RunningScriptsWidget_h
 #define hifi_RunningScriptsWidget_h
 
-// Qt
-#include <QDockWidget>
-
+#include "FramelessDialog.h"
 #include "ScriptsTableWidget.h"
 
 namespace Ui {
     class RunningScriptsWidget;
 }
 
-class RunningScriptsWidget : public QDockWidget
+class RunningScriptsWidget : public FramelessDialog
 {
     Q_OBJECT
 public: