[Companion][MdiChild] Possible fix for "disappearing" toolbars in file editor windows.

This commit is contained in:
Max Paperno
2018-06-03 15:42:52 -04:00
parent cd8f006d31
commit c19b1a65bf
+8 -5
View File
@@ -120,6 +120,8 @@ void MdiChild::closeEvent(QCloseEvent *event)
event->ignore(); event->ignore();
return; return;
} }
event->accept();
if (!isMinimized()) { if (!isMinimized()) {
QByteArray geo; QByteArray geo;
if (isMaximized()) if (isMaximized())
@@ -131,15 +133,16 @@ void MdiChild::closeEvent(QCloseEvent *event)
g.mdiWinGeo(geo); g.mdiWinGeo(geo);
} }
if (!isVisible())
return;
QByteArray state; QByteArray state;
QDataStream stream(&state, QIODevice::WriteOnly); QDataStream stream(&state, QIODevice::WriteOnly);
stream << stateDataVersion stream << stateDataVersion
<< (firmware->getCapability(Capability::HasModelCategories) ? categoriesToolbar->isVisible() : showCatToolbar) << (firmware->getCapability(Capability::HasModelCategories) ? categoriesToolbar->isVisible() : showCatToolbar)
<< modelsToolbar->isVisible() << modelsToolbar->isVisible()
<< radioToolbar->isVisible(); << radioToolbar->isVisible();
g.mdiWinState(state); g.mdiWinState(state);
event->accept();
} }
void MdiChild::resizeEvent(QResizeEvent * event) void MdiChild::resizeEvent(QResizeEvent * event)