From f79c2929a5b9baa81279d016341a01bf160eaa3c Mon Sep 17 00:00:00 2001 From: necrashter Date: Tue, 19 Mar 2019 12:06:02 +0300 Subject: [PATCH] Fix empty editors after closing them and creating a new project (#4891) --- include/Editor.h | 1 + src/gui/editors/Editor.cpp | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/Editor.h b/include/Editor.h index 4b9017e9e..c93864439 100644 --- a/include/Editor.h +++ b/include/Editor.h @@ -47,6 +47,7 @@ protected: DropToolBar * addDropToolBar(Qt::ToolBarArea whereToAdd, QString const & windowTitle); DropToolBar * addDropToolBar(QWidget * parent, Qt::ToolBarArea whereToAdd, QString const & windowTitle); + virtual void closeEvent( QCloseEvent * _ce ); protected slots: virtual void play() {} virtual void record() {} diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp index bdc3e55d4..9aa81fabb 100644 --- a/src/gui/editors/Editor.cpp +++ b/src/gui/editors/Editor.cpp @@ -32,6 +32,7 @@ #include #include #include +#include void Editor::setPauseIcon(bool displayPauseIcon) @@ -121,8 +122,18 @@ QAction *Editor::playAction() const return m_playAction; } - - +void Editor::closeEvent( QCloseEvent * _ce ) +{ + if( parentWidget() ) + { + parentWidget()->hide(); + } + else + { + hide(); + } + _ce->ignore(); + } DropToolBar::DropToolBar(QWidget* parent) : QToolBar(parent) { @@ -138,3 +149,6 @@ void DropToolBar::dropEvent(QDropEvent* event) { dropped(event); } + + +