From d1519026e65e8e914207989b0f9af1e534e48b2d Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 22 Oct 2019 15:51:26 +0100 Subject: [PATCH 1/2] Update version number for 5.17.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bb886531..58cefc7f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-workspace) -set(PROJECT_VERSION "5.17.0") +set(PROJECT_VERSION "5.17.1") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") From 0e25e9ad108d074f01b3a70a77e1fb7899b05058 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Wed, 23 Oct 2019 10:41:16 +0200 Subject: [PATCH 2/2] clear the cells before relayouting the items when items are moved around due to screen resolution change, no cell should be considered as taken, because all items will be moved, otherwise items will be moved and resized in unexpected ways to make room for "ghost" items. Clear the bookkeeping before doing the move BUG:413019 --- components/containmentlayoutmanager/gridlayoutmanager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/containmentlayoutmanager/gridlayoutmanager.cpp b/components/containmentlayoutmanager/gridlayoutmanager.cpp index 739694714..491db2247 100644 --- a/components/containmentlayoutmanager/gridlayoutmanager.cpp +++ b/components/containmentlayoutmanager/gridlayoutmanager.cpp @@ -108,6 +108,8 @@ inline void maintainItemEdgeAlignment(ItemContainer *item, const QRectF &newRect void GridLayoutManager::layoutGeometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { + m_grid.clear(); + m_pointsForItem.clear(); for (auto *item : layout()->childItems()) { // Stash the old config //m_parsedConfig[item->key()] = {item->x(), item->y(), item->width(), item->height(), item->rotation()};