From 19b8948b5186b3cf8c79bcc8c101d7354ad1f697 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Fri, 4 Aug 2023 13:38:46 +0200 Subject: [PATCH] kcms/decoration: Rename dragging property to dragActive ListView/GridView already have a dragging property and Qt 6.6 makes it FINAL to prevent you from overriding it. --- src/kcms/decoration/ui/ButtonGroup.qml | 4 ++-- src/kcms/decoration/ui/Buttons.qml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kcms/decoration/ui/ButtonGroup.qml b/src/kcms/decoration/ui/ButtonGroup.qml index 6f0530cdc2..f504c76bd7 100644 --- a/src/kcms/decoration/ui/ButtonGroup.qml +++ b/src/kcms/decoration/ui/ButtonGroup.qml @@ -11,7 +11,7 @@ import org.kde.kwin.private.kdecoration as KDecoration ListView { id: view property string key - property bool dragging: false + property bool dragActive: false property int iconSize: Kirigami.Units.iconSizes.small orientation: ListView.Horizontal interactive: false @@ -33,7 +33,7 @@ ListView { anchors.fill: Drag.active ? undefined : parent Drag.keys: [ "decoButtonRemove", view.key ] Drag.active: dragArea.drag.active - Drag.onActiveChanged: view.dragging = Drag.active + Drag.onActiveChanged: view.dragActive = Drag.active color: palette.windowText opacity: parent.enabled ? 1.0 : 0.3 } diff --git a/src/kcms/decoration/ui/Buttons.qml b/src/kcms/decoration/ui/Buttons.qml index 0554377de9..148e4eb9da 100644 --- a/src/kcms/decoration/ui/Buttons.qml +++ b/src/kcms/decoration/ui/Buttons.qml @@ -18,8 +18,8 @@ Rectangle { readonly property int buttonIconSize: Kirigami.Units.iconSizes.medium readonly property int titleBarSpacing: Kirigami.Units.largeSpacing - readonly property bool draggingTitlebarButtons: leftButtonsView.dragging || rightButtonsView.dragging - readonly property bool hideDragHint: draggingTitlebarButtons || availableButtonsGrid.dragging + readonly property bool draggingTitlebarButtons: leftButtonsView.dragActive || rightButtonsView.dragActive + readonly property bool hideDragHint: draggingTitlebarButtons || availableButtonsGrid.dragActive color: palette.base radius: Kirigami.Units.smallSpacing @@ -172,7 +172,7 @@ Rectangle { } GridView { id: availableButtonsGrid - property bool dragging: false + property bool dragActive: false Layout.fillWidth: true Layout.fillHeight: true Layout.minimumHeight: availableButtonsGrid.cellHeight * 2 @@ -204,7 +204,7 @@ Rectangle { height: baseLayout.buttonIconSize Drag.keys: [ "decoButtonAdd" ] Drag.active: dragArea.drag.active - Drag.onActiveChanged: availableButtonsGrid.dragging = Drag.active + Drag.onActiveChanged: availableButtonsGrid.dragActive = Drag.active color: palette.windowText } MouseArea {