From 0f17d9ebf2df231bb9a1fb9c7195ae53e6999379 Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Fri, 9 Aug 2019 11:02:21 -0600 Subject: [PATCH] [kcmkwin/kwineffects] Use new Kirigami ListSectionHeader component Summary: This allows all the section headers to always have the same look and feel and be adjusted in just one place. Depends on D23049 Test Plan: {F7181776} Reviewers: #vdg, kwin, GB_2, #kwin Reviewed By: #vdg, GB_2 Tags: #kwin Maniphest Tasks: T10384 Differential Revision: https://phabricator.kde.org/D23055 --- CMakeLists.txt | 2 +- kcmkwin/kwindesktop/package/contents/ui/main.qml | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 735eeaeb84..f7d85a419a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(PROJECT_VERSION "5.16.80") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.12.0") -set(KF5_MIN_VERSION "5.58.0") +set(KF5_MIN_VERSION "5.62.0") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) diff --git a/kcmkwin/kwindesktop/package/contents/ui/main.qml b/kcmkwin/kwindesktop/package/contents/ui/main.qml index b2be8bc99a..bd3d053a68 100644 --- a/kcmkwin/kwindesktop/package/contents/ui/main.qml +++ b/kcmkwin/kwindesktop/package/contents/ui/main.qml @@ -22,7 +22,7 @@ import QtQuick.Controls 2.5 as QQC2 import QtQuick.Layouts 1.1 import org.kde.kcm 1.2 -import org.kde.kirigami 2.5 as Kirigami +import org.kde.kirigami 2.10 as Kirigami import org.kde.plasma.core 2.1 as PlasmaCore ScrollViewKCM { @@ -124,19 +124,9 @@ ScrollViewKCM { model: kcm.desktopsModel.ready ? kcm.desktopsModel : null section.property: "DesktopRow" - section.delegate: Kirigami.AbstractListItem { + section.delegate: Kirigami.ListSectionHeader { width: desktopsList.width - - backgroundColor: Kirigami.Theme.backgroundColor - Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: Kirigami.Theme.Window - - hoverEnabled: false - supportsMouseEvents: false - - Kirigami.Heading { - level: 2 - text: i18n("Row %1", section) + label: i18n("Row %1", section) } }