From 2ef8277d0f3ea367c3ee9825a81c60d001b950bd Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Thu, 3 Apr 2014 18:04:26 +0530 Subject: [PATCH] Make the widget move and resize along with the main window --- interface/interface_en.ts | 8 ++++---- interface/src/Application.cpp | 7 +++++++ interface/src/Application.h | 1 + interface/src/ui/ScriptsTableWidget.cpp | 2 -- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/interface/interface_en.ts b/interface/interface_en.ts index 3446903bb3..92ccb01cb4 100644 --- a/interface/interface_en.ts +++ b/interface/interface_en.ts @@ -4,22 +4,22 @@ Application - + Export Voxels - + Sparse Voxel Octree Files (*.svo) - + Open Script - + JavaScript Files (*.js) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index aae1a227a1..a63cbffd31 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -619,6 +619,11 @@ void Application::resizeGL(int width, int height) { updateProjectionMatrix(); glLoadIdentity(); + + if (_runningScriptsWidgetVisible) + _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(), + _window->geometry().topLeft().y(), + _runningScriptsWidget->width(), _window->height()); } void Application::updateProjectionMatrix() { @@ -3629,6 +3634,7 @@ void Application::toggleRunningScriptsWidget() _runningScriptsWidget->resize(0, _window->height()); _runningScriptsWidget->toggleViewAction()->trigger(); _runningScriptsWidget->grabKeyboard(); + _runningScriptsWidgetVisible = true; QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); slideAnimation->setStartValue(_runningScriptsWidget->geometry()); @@ -3638,6 +3644,7 @@ void Application::toggleRunningScriptsWidget() slideAnimation->start(QAbstractAnimation::DeleteWhenStopped); } else { _runningScriptsWidget->releaseKeyboard(); + _runningScriptsWidgetVisible = false; QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); slideAnimation->setStartValue(_runningScriptsWidget->geometry()); diff --git a/interface/src/Application.h b/interface/src/Application.h index 221a81478e..32e8d3ac62 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -502,6 +502,7 @@ private: RunningScriptsWidget* _runningScriptsWidget; QHash _scriptEnginesHash; + bool _runningScriptsWidgetVisible; }; #endif /* defined(__interface__Application__) */ diff --git a/interface/src/ui/ScriptsTableWidget.cpp b/interface/src/ui/ScriptsTableWidget.cpp index e954500022..af67b939eb 100644 --- a/interface/src/ui/ScriptsTableWidget.cpp +++ b/interface/src/ui/ScriptsTableWidget.cpp @@ -8,9 +8,7 @@ #include "ScriptsTableWidget.h" #include -#include #include -#include #include ScriptsTableWidget::ScriptsTableWidget(QWidget *parent) :