Skip to content

Commit aa66caa

Browse files
deepin-ci-robot18202781743
authored andcommitted
sync: from linuxdeepin/dtkdeclarative
Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#495
1 parent 348d989 commit aa66caa

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

qt6/src/qml/FloatingPanel.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Control {
2222
property int blurRadius: 64
2323
// blur blurMultiplier
2424
property real blurMultiplier: 0.0
25+
property alias enableBlur: blur.valid
2526

2627
background: D.InWindowBlur {
2728
id: blur
@@ -41,7 +42,7 @@ Control {
4142

4243
Loader {
4344
anchors.fill: parent
44-
active: Window.window && Window.window.color.a < 1
45+
active: Window.window && Window.window.color.a < 1 && blur.valid
4546
sourceComponent: D.ItemViewport {
4647
anchors.fill: parent
4748
fixed: true

qt6/src/qml/Menu.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ T.Menu {
109109
backgroundColor: control.backgroundColor
110110
backgroundNoBlurColor: control.backgroundNoBlurColor
111111
outsideBorderColor: null
112+
enableBlur: false // TODO disable blur temporarily, pms:BUG 300055
112113
}
113114
}
114115

qt6/src/qml/overridable/InWindowBlur.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Item {
1313
property alias multiplier: blur.blurMultiplier
1414
property alias content: blur
1515
default property alias data: blitter.data
16-
readonly property bool valid: blitter.blitterEnabled
16+
property alias valid: blitter.blitterEnabled
1717

1818
D.BackdropBlitter {
1919
id: blitter

0 commit comments

Comments
 (0)