philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make LayoutSaver deserializeWindowGeometry deal in Window instead of View

Browse Source
This commit is contained in:
Sergio Martins
2022-06-06 11:23:07 +01:00
parent 9c881ec53e
commit 14189dc601
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/LayoutSaver.cpp
View File

@@ -487,8 +487,8 @@ bool LayoutSaver::restoreLayout(const QByteArray &data)
continue;
if (!(d->m_restoreOptions & InternalRestoreOption::SkipMainWindowGeometry)) {
auto window = mainWindow->view()->rootView();
d->deserializeWindowGeometry(mw, window.get()); // window(), as the MainWindow can be embedded
Window::Ptr window = mainWindow->view()->window();
d->deserializeWindowGeometry(mw, window);
if (mw.windowState != Qt::WindowNoState) {
if (auto w = mainWindow->view()->window()) {
w->setWindowState(mw.windowState);
@@ -510,7 +510,7 @@ bool LayoutSaver::restoreLayout(const QByteArray &data)
auto floatingWindow = new Controllers::FloatingWindow({}, parent);
fw.floatingWindowInstance = floatingWindow;
d->deserializeWindowGeometry(fw, floatingWindow->view());
d->deserializeWindowGeometry(fw, floatingWindow->view()->window());
if (!floatingWindow->deserialize(fw)) {
qWarning() << Q_FUNC_INFO << "Failed to deserialize floating window";
return false;
@@ -576,7 +576,7 @@ void LayoutSaver::Private::clearRestoredProperty()
}
template<typename T>
void LayoutSaver::Private::deserializeWindowGeometry(const T &saved, View *topLevel)
void LayoutSaver::Private::deserializeWindowGeometry(const T &saved, Window::Ptr window)
{
// Not simply calling QWidget::setGeometry() here.
// For QtQuick we need to modify the QWindow's geometry.
@@ -590,8 +590,8 @@ void LayoutSaver::Private::deserializeWindowGeometry(const T &saved, View *topLe
Controllers::FloatingWindow::ensureRectIsOnScreen(geometry);
topLevel->window()->setGeometry(geometry);
topLevel->window()->setVisible(saved.isVisible);
window->setGeometry(geometry);
window->setVisible(saved.isVisible);
}
LayoutSaver::Private::Private(RestoreOptions options)

3
src/private/LayoutSaver_p.h
View File

@@ -14,6 +14,7 @@
#include "kddockwidgets/KDDockWidgets.h"
#include "kddockwidgets/LayoutSaver.h"
#include "Window.h"
#include <QDebug>
#include <QGuiApplication>
@@ -324,7 +325,7 @@ public:
void floatUnknownWidgets(const LayoutSaver::Layout &layout);
template<typename T>
void deserializeWindowGeometry(const T &saved, View *topLevel);
void deserializeWindowGeometry(const T &saved, Window::Ptr);
void deleteEmptyFrames();
void clearRestoredProperty();