From dd74ea64e7161827c021147f9082ff729f2c9814 Mon Sep 17 00:00:00 2001
From: Mohammed Nafees <nafees.technocool@gmail.com>
Date: Thu, 24 Apr 2014 17:18:24 +0530
Subject: [PATCH] Further changes for child like behaviour

---
 interface/interface_en.ts                 |  4 ++--
 interface/src/Application.cpp             | 11 +++--------
 interface/src/MainWindow.cpp              |  5 +++++
 interface/src/ui/RunningScriptsWidget.cpp |  6 +++++-
 interface/src/ui/RunningScriptsWidget.h   |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/interface/interface_en.ts b/interface/interface_en.ts
index 543a032a4f..aa979781de 100644
--- a/interface/interface_en.ts
+++ b/interface/interface_en.ts
@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3749"/>
+        <location filename="src/Application.cpp" line="3742"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3750"/>
+        <location filename="src/Application.cpp" line="3743"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 752dff28a6..df59b6574f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -625,7 +625,7 @@ void Application::resizeGL(int width, int height) {
     updateProjectionMatrix();
     glLoadIdentity();
 
-    if (_runningScriptsWidget->toggleViewAction()->isChecked()) {
+    if (_runningScriptsWidgetWasVisible) {
         _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
                                            _window->geometry().topLeft().y(),
                                            _runningScriptsWidget->width(), _window->height());
@@ -3636,19 +3636,15 @@ void Application::reloadAllScripts() {
 void Application::manageRunningScriptsWidgetVisibility(bool shown)
 {
     if (_runningScriptsWidgetWasVisible && shown) {
-        _runningScriptsWidget->setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint |
-                                              Qt::WindowStaysOnTopHint);
         _runningScriptsWidget->show();
-    } else {
-        _runningScriptsWidget->setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint);
+    } else if (_runningScriptsWidgetWasVisible && !shown) {
         _runningScriptsWidget->hide();
     }
 }
 
 void Application::toggleRunningScriptsWidget()
 {
-    if (_runningScriptsWidget->toggleViewAction()->isChecked()) {
-        _runningScriptsWidget->toggleViewAction()->setChecked(false);
+    if (_runningScriptsWidgetWasVisible) {
         _runningScriptsWidget->hide();
         _runningScriptsWidgetWasVisible = false;
     } else {
@@ -3657,7 +3653,6 @@ void Application::toggleRunningScriptsWidget()
         _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
                                            _window->geometry().topLeft().y(),
                                            _runningScriptsWidget->width(), _window->height());
-        _runningScriptsWidget->toggleViewAction()->setChecked(true);
         _runningScriptsWidget->show();
         _runningScriptsWidgetWasVisible = true;
     }
diff --git a/interface/src/MainWindow.cpp b/interface/src/MainWindow.cpp
index 86d24e1148..4711d97232 100644
--- a/interface/src/MainWindow.cpp
+++ b/interface/src/MainWindow.cpp
@@ -22,11 +22,13 @@ MainWindow::MainWindow(QWidget *parent) :
 void MainWindow::moveEvent(QMoveEvent *e)
 {
     emit windowGeometryChanged(QRect(e->pos(), size()));
+    QMainWindow::moveEvent(e);
 }
 
 void MainWindow::resizeEvent(QResizeEvent *e)
 {
     emit windowGeometryChanged(QRect(QPoint(x(), y()), e->size()));
+    QMainWindow::resizeEvent(e);
 }
 
 void MainWindow::showEvent(QShowEvent *e)
@@ -34,6 +36,7 @@ void MainWindow::showEvent(QShowEvent *e)
     if (e->spontaneous()) {
         emit windowShown(true);
     }
+    QMainWindow::showEvent(e);
 }
 
 void MainWindow::hideEvent(QHideEvent *e)
@@ -41,6 +44,7 @@ void MainWindow::hideEvent(QHideEvent *e)
     if (e->spontaneous()) {
         emit windowShown(false);
     }
+    QMainWindow::hideEvent(e);
 }
 
 void MainWindow::changeEvent(QEvent *e)
@@ -61,4 +65,5 @@ void MainWindow::changeEvent(QEvent *e)
             emit windowShown(false);
         }
     }
+    QMainWindow::changeEvent(e);
 }
diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp
index adb4669a31..826aaf7a6a 100644
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@@ -16,7 +16,7 @@
 
 #include "Application.h"
 
-RunningScriptsWidget::RunningScriptsWidget(QDockWidget *parent) :
+RunningScriptsWidget::RunningScriptsWidget(QWidget *parent) :
     QDockWidget(parent),
     ui(new Ui::RunningScriptsWidget),
     _mousePressed(false),
@@ -105,6 +105,7 @@ void RunningScriptsWidget::mousePressEvent(QMouseEvent *e)
         _mousePressed = false;
         _mousePosition = QPoint();
     }
+    QWidget::mousePressEvent(e);
 }
 
 void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
@@ -116,6 +117,7 @@ void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
             move(newPosition.x(), _boundary.y());
         }
     }
+    QWidget::mouseMoveEvent(e);
 }
 
 void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
@@ -124,6 +126,7 @@ void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
         _mousePressed = false;
         _mousePosition = QPoint();
     }
+    QWidget::mouseReleaseEvent(e);
 }
 
 void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
@@ -188,6 +191,7 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
     default:
         break;
     }
+    QWidget::keyPressEvent(e);
 }
 
 void RunningScriptsWidget::paintEvent(QPaintEvent *)
diff --git a/interface/src/ui/RunningScriptsWidget.h b/interface/src/ui/RunningScriptsWidget.h
index d34b15d0eb..73dc8e3887 100644
--- a/interface/src/ui/RunningScriptsWidget.h
+++ b/interface/src/ui/RunningScriptsWidget.h
@@ -20,7 +20,7 @@ class RunningScriptsWidget : public QDockWidget
 {
     Q_OBJECT
 public:
-    explicit RunningScriptsWidget(QDockWidget *parent = 0);
+    explicit RunningScriptsWidget(QWidget *parent = 0);
     ~RunningScriptsWidget();
 
     void setRunningScripts(const QStringList& list);