yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kcms/decoration: Rename dragging property to dragActive

Browse source 
ListView/GridView already have a dragging property and Qt 6.6
makes it FINAL to prevent you from overriding it.
This commit is contained in:
Kai Uwe Broulik 2023-08-04 13:38:46 +02:00
parent 8d571b0d1d
commit 19b8948b51
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/kcms/decoration/ui/ButtonGroup.qml
View file

@ -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
}

8
src/kcms/decoration/ui/Buttons.qml
View file

@ -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 {