mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Merge pull request #1834 from whiskeyPeak/fix-launcher-scrolling-interrupt
fix launcher scrolling pin button interrupt
This commit is contained in:
@@ -1034,6 +1034,7 @@ Rectangle {
|
||||
baseSize: Style.baseWidgetSize * 0.75
|
||||
tooltipText: modelData.tooltip
|
||||
z: 1
|
||||
allowScroll: true
|
||||
onClicked: {
|
||||
if (modelData.action) {
|
||||
modelData.action();
|
||||
@@ -1410,6 +1411,7 @@ Rectangle {
|
||||
baseSize: Style.baseWidgetSize * 0.75
|
||||
tooltipText: modelData.tooltip
|
||||
z: 11
|
||||
allowScroll: true
|
||||
onClicked: {
|
||||
if (modelData.action) {
|
||||
modelData.action();
|
||||
|
||||
@@ -14,6 +14,7 @@ Item {
|
||||
property string tooltipText
|
||||
property string tooltipDirection: "auto"
|
||||
property bool allowClickWhenDisabled: false
|
||||
property bool allowScroll: false
|
||||
property bool hovering: false
|
||||
|
||||
property color colorBg: Color.mSurfaceVariant
|
||||
@@ -122,6 +123,13 @@ Item {
|
||||
root.middleClicked();
|
||||
}
|
||||
}
|
||||
onWheel: wheel => root.wheel(wheel.angleDelta.y)
|
||||
onWheel: wheel => {
|
||||
if (root.allowScroll) {
|
||||
root.wheel(wheel.angleDelta.y);
|
||||
wheel.accepted = false;
|
||||
} else {
|
||||
wheel.accepted = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user