Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 10:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make the widget move and resize along with the main window

Browse source
This commit is contained in:
Mohammed Nafees 2014-04-03 18:04:26 +05:30
parent e5d9812742
commit 2ef8277d0f
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/interface_en.ts
View file

@ -4,22 +4,22 @@
<context> <context>
<name>Application</name> <name>Application</name>
<message> <message>
<location filename="src/Application.cpp" line="1389"/> <location filename="src/Application.cpp" line="1394"/>
<source>Export Voxels</source> <source>Export Voxels</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="src/Application.cpp" line="1390"/> <location filename="src/Application.cpp" line="1395"/>
<source>Sparse Voxel Octree Files (*.svo)</source> <source>Sparse Voxel Octree Files (*.svo)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="src/Application.cpp" line="3734"/> <location filename="src/Application.cpp" line="3741"/>
<source>Open Script</source> <source>Open Script</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="src/Application.cpp" line="3735"/> <location filename="src/Application.cpp" line="3742"/>
<source>JavaScript Files (*.js)</source> <source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

7
interface/src/Application.cpp
View file

@ -619,6 +619,11 @@ void Application::resizeGL(int width, int height) {
updateProjectionMatrix(); updateProjectionMatrix();
glLoadIdentity(); glLoadIdentity();
if (_runningScriptsWidgetVisible)
_runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
_window->geometry().topLeft().y(),
_runningScriptsWidget->width(), _window->height());
} }
void Application::updateProjectionMatrix() { void Application::updateProjectionMatrix() {
@ -3629,6 +3634,7 @@ void Application::toggleRunningScriptsWidget()
_runningScriptsWidget->resize(0, _window->height()); _runningScriptsWidget->resize(0, _window->height());
_runningScriptsWidget->toggleViewAction()->trigger(); _runningScriptsWidget->toggleViewAction()->trigger();
_runningScriptsWidget->grabKeyboard(); _runningScriptsWidget->grabKeyboard();
_runningScriptsWidgetVisible = true;
QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget);
slideAnimation->setStartValue(_runningScriptsWidget->geometry()); slideAnimation->setStartValue(_runningScriptsWidget->geometry());
@ -3638,6 +3644,7 @@ void Application::toggleRunningScriptsWidget()
slideAnimation->start(QAbstractAnimation::DeleteWhenStopped); slideAnimation->start(QAbstractAnimation::DeleteWhenStopped);
} else { } else {
_runningScriptsWidget->releaseKeyboard(); _runningScriptsWidget->releaseKeyboard();
_runningScriptsWidgetVisible = false;
QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget);
slideAnimation->setStartValue(_runningScriptsWidget->geometry()); slideAnimation->setStartValue(_runningScriptsWidget->geometry());

1
interface/src/Application.h
View file

@ -502,6 +502,7 @@ private:
RunningScriptsWidget* _runningScriptsWidget; RunningScriptsWidget* _runningScriptsWidget;
QHash<QString, ScriptEngine*> _scriptEnginesHash; QHash<QString, ScriptEngine*> _scriptEnginesHash;
bool _runningScriptsWidgetVisible;
}; };
#endif /* defined(__interface__Application__) */ #endif /* defined(__interface__Application__) */

2
interface/src/ui/ScriptsTableWidget.cpp
View file

@ -8,9 +8,7 @@
#include "ScriptsTableWidget.h" #include "ScriptsTableWidget.h"
#include <QHeaderView> #include <QHeaderView>
#include <QFont>
#include <QPainter> #include <QPainter>
#include <QIcon>
#include <QDebug> #include <QDebug>
ScriptsTableWidget::ScriptsTableWidget(QWidget *parent) : ScriptsTableWidget::ScriptsTableWidget(QWidget *parent) :