Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
+1 -3
View File
@@ -465,8 +465,6 @@ void DockWidget::RestoreState(bool forceDefault)
QRect DockWidget::ProperGeometry() const
{
Qt::DockWidgetArea area = isFloating() ? Qt::NoDockWidgetArea : m_mainWindow->dockWidgetArea(const_cast<DockWidget*>(this));
QRect myGeom(pos(), size());
// we need this state in global coordinates, but if we're parented to one of those group dock windows, there is a problem, it will be local coords.
@@ -1366,7 +1364,7 @@ bool QtViewPaneManager::RestoreLayout(QString layoutName)
for (const QString& paneName : state.viewPanes)
{
const QtViewPane* pane = OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
OpenPane(paneName, QtViewPane::OpenMode::OnlyOpen);
}
// must do this after opening all of the panes!