Skip to content

Fix Empty Editors after closing them and creating a new project #4891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhysSong merged 1 commit into from
Mar 19, 2019
+17 −2
Merged

Fix Empty Editors after closing them and creating a new project #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/Editor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class Editor : public QMainWindow
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() {}
Expand Down
18 changes: 16 additions & 2 deletions src/gui/editors/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <QAction>
#include <QMdiArea>
#include <QShortcut>
#include <QCloseEvent>


void Editor::setPauseIcon(bool displayPauseIcon)
Expand Down Expand Up @@ -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)
{
Expand All @@ -138,3 +149,6 @@ void DropToolBar::dropEvent(QDropEvent* event)
{
dropped(event);
}