sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#269
linuxdeepin · Jan 4, 2024 · 3988e74 · 3988e74
1 parent f469d0c
commit 3988e74
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/qt6/src/qml/FloatingPanel.qml b/qt6/src/qml/FloatingPanel.qml
@@ -15,7 +15,6 @@ Control {
     property D.Palette dropShadowColor: DS.Style.floatingPanel.dropShadow
     property D.Palette outsideBorderColor: DS.Style.floatingPanel.outsideBorder
     property D.Palette insideBorderColor: DS.Style.floatingPanel.insideBorder
-    property bool enableOffScreen: true
     // corner radius
     property int radius: DS.Style.floatingPanel.radius
     // blur radius
@@ -25,7 +24,7 @@ Control {
         implicitWidth: DS.Style.floatingPanel.width
         implicitHeight: DS.Style.floatingPanel.height
         radius: blurRadius
-        offscreen: enableOffScreen
+        offscreen: true
 
         D.ItemViewport {
             anchors.fill: parent

diff --git a/qt6/src/qml/Menu.qml b/qt6/src/qml/Menu.qml
@@ -85,7 +85,6 @@ T.Menu {
             implicitHeight: DS.Style.menu.item.height
             radius: DS.Style.menu.radius
             backgroundColor: control.backgroundColor
-            enableOffScreen: false
         }
     }
 }
diff --git a/src/private/dblurimagenode.cpp b/src/private/dblurimagenode.cpp
@@ -516,7 +516,7 @@ void DOpenGLBlurEffectNode::render(const QSGRenderNode::RenderState *state)
 QSGRenderNode::StateFlags DOpenGLBlurEffectNode::changedStates() const
 {
     if (m_offscreen)
-        return StateFlags();
+        return BlendState;
     return BlendState | StencilState | ScissorState;
 }
 
@@ -604,6 +604,9 @@ void DOpenGLBlurEffectNode::applyDaulBlur(QOpenGLFramebufferObject *targetFBO, G
     QOpenGLFunctions *f = context->functions();
     shader->bind();
 
+    glEnable(GL_BLEND);
+    f->glBlendFunc(GL_ONE, GL_ZERO);
+
     // TODO(xiaoyaobing): Shader pixel offset value during hardware rendering, because software rendering
     //                    does not, so write a fixed value here
     shader->setUniformValue("offset", QVector2D(8, 8));

diff --git a/src/qml/FloatingPanel.qml b/src/qml/FloatingPanel.qml
@@ -15,7 +15,6 @@ Control {
     property D.Palette dropShadowColor: DS.Style.floatingPanel.dropShadow
     property D.Palette outsideBorderColor: DS.Style.floatingPanel.outsideBorder
     property D.Palette insideBorderColor: DS.Style.floatingPanel.insideBorder
-    property bool enableOffScreen: true
     // corner radius
     property int radius: DS.Style.floatingPanel.radius
     // blur radius
@@ -25,7 +24,7 @@ Control {
         implicitWidth: DS.Style.floatingPanel.width
         implicitHeight: DS.Style.floatingPanel.height
         radius: blurRadius
-        offscreen: enableOffScreen
+        offscreen: true
 
         D.ItemViewport {
             anchors.fill: parent

diff --git a/src/qml/Menu.qml b/src/qml/Menu.qml
@@ -85,7 +85,6 @@ T.Menu {
             implicitHeight: DS.Style.menu.item.height
             radius: DS.Style.menu.radius
             backgroundColor: control.backgroundColor
-            enableOffScreen: false
         }
     }
 }