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

EditorWindow on-top behavior fixed

Browse source
This commit is contained in:
Thijs Wenker 2014-04-30 08:24:04 +02:00
parent 89aafd9c3f
commit c20381a0ea
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,7 +126,7 @@ void ScriptEditorWidget::loadFile(const QString& scriptPath) {
loop.exec(); loop.exec();
_scriptEditorWidgetUI->scriptEdit->setPlainText(reply->readAll()); _scriptEditorWidgetUI->scriptEdit->setPlainText(reply->readAll());
if (!saveAs()) { if (!saveAs()) {
emit static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->terminateCurrentTab(); static_cast<ScriptEditorWindow*>(this->parent()->parent()->parent())->terminateCurrentTab();
} }
} }

3
interface/src/ui/ScriptEditorWindow.cpp
View file

@ -34,7 +34,7 @@ ScriptEditorWindow::ScriptEditorWindow() :
_saveMenu(new QMenu) _saveMenu(new QMenu)
{ {
_ScriptEditorWindowUI->setupUi(this); _ScriptEditorWindowUI->setupUi(this);
this->setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint); this->setWindowFlags(Qt::Tool);
show(); show();
addScriptEditorWidget("New script"); addScriptEditorWidget("New script");
connect(_loadMenu, SIGNAL(aboutToShow()), this, SLOT(loadMenuAboutToShow())); connect(_loadMenu, SIGNAL(aboutToShow()), this, SLOT(loadMenuAboutToShow()));
@ -206,5 +206,6 @@ void ScriptEditorWindow::updateScriptNameOrStatus() {
void ScriptEditorWindow::terminateCurrentTab() { void ScriptEditorWindow::terminateCurrentTab() {
if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) { if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
_ScriptEditorWindowUI->tabWidget->removeTab(_ScriptEditorWindowUI->tabWidget->currentIndex()); _ScriptEditorWindowUI->tabWidget->removeTab(_ScriptEditorWindowUI->tabWidget->currentIndex());
this->raise();
} }
} }

5
interface/src/ui/ScriptEditorWindow.h
View file

@ -25,6 +25,8 @@ public:
ScriptEditorWindow(); ScriptEditorWindow();
~ScriptEditorWindow(); ~ScriptEditorWindow();
void terminateCurrentTab();
protected: protected:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event);
@ -37,9 +39,6 @@ private:
void setRunningState(bool run); void setRunningState(bool run);
void setScriptName(const QString& scriptName); void setScriptName(const QString& scriptName);
public slots:
void terminateCurrentTab();
private slots: private slots:
void loadScriptMenu(const QString& scriptName); void loadScriptMenu(const QString& scriptName);
void loadScriptClicked(); void loadScriptClicked();