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

Fix reading floating window flags from >=1.6 layouts

Browse Source 
1.7 introduced per-floating-window "flags" in the saved layouts. When
that value is not present in the saved layout, we need to fallback from
reading from Config global settings
This commit is contained in:
Sergio Martins
2023-03-10 17:16:10 +00:00
parent 59f7280d59
commit 4d50376ccf
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LayoutSaver.cpp
View File

@@ -838,7 +838,7 @@ void LayoutSaver::FloatingWindow::fromVariantMap(const QVariantMap &map)
geometry = Layouting::mapToRect(map.value(QStringLiteral("geometry")).toMap());
normalGeometry = Layouting::mapToRect(map.value(QStringLiteral("normalGeometry")).toMap());
screenIndex = map.value(QStringLiteral("screenIndex")).toInt();
flags = map.value(QStringLiteral("flags")).toInt();
flags = map.value(QStringLiteral("flags"), int(FloatingWindowFlag::FromGlobalConfig)).toInt();
screenSize = Layouting::mapToSize(map.value(QStringLiteral("screenSize")).toMap());
isVisible = map.value(QStringLiteral("isVisible")).toBool();
affinities = variantToStringList(map.value(QStringLiteral("affinities")).toList());

2
tests/tst_docks.cpp
View File

@@ -8000,7 +8000,5 @@ void TestDocks::tst_restoreFlagsFromVersion16()
auto floatingWindow = dock1->floatingWindow();
QVERIFY(floatingWindow);
QEXPECT_FAIL("", "Fixing", Continue);
QCOMPARE(floatingWindow->floatingWindowFlags(), FloatingWindowFlag::HideTitleBarWhenTabsVisible);
}