Use a translucent background in PE_Widget if needed

tsujan · Nov 4, 2024 · faee077 · faee077
1 parent 43a4940
commit faee077
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 14 deletions.
diff --git a/Kvantum/ChangeLog b/Kvantum/ChangeLog
@@ -1,6 +1,7 @@
 V1.1.4
 ---------
  * Exclude the opaque list from blurring of hard-coded translucency.
+ * Use a translucent background in "PE_Widget" if needed and existing.
 
 V1.1.3
 ---------

diff --git a/Kvantum/NEWS b/Kvantum/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	3 Nov 2024, V1.1.4
+	4 Nov 2024, V1.1.4
 
 See "ChangeLog" for changes.
diff --git a/Kvantum/style/Kvantum.cpp b/Kvantum/style/Kvantum.cpp
@@ -1807,7 +1807,7 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
       }
       if (widget) // it's NULL with QML
       {
-        if (widget->windowType() == Qt::ToolTip)
+        if (widget->windowType() == Qt::ToolTip && !translucentWidgets_.contains(widget))
         {
           painter->fillRect(option->rect, standardPalette().color(QPalette::Window));
           break;
@@ -1834,24 +1834,65 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
                                                                 QPalette::Window));
       }
 
-      interior_spec ispec = getInteriorSpec(KSL("Dialog"));
-      size_spec sspec = getSizeSpec(KSL("Dialog"));
+      interior_spec ispec;
+      size_spec sspec;
+      if (widget && translucentWidgets_.contains(widget))
+      {
+        ispec = getInteriorSpec(KSL("DialogTranslucent"));
+        sspec = getSizeSpec(KSL("DialogTranslucent"));
+        if (ispec.element.isEmpty())
+        {
+          ispec = getInteriorSpec(KSL("Dialog"));
+          sspec = getSizeSpec(KSL("Dialog"));
+        }
+      }
+      else
+      {
+        ispec = getInteriorSpec(KSL("Dialog"));
+        sspec = getSizeSpec(KSL("Dialog"));
+      }
       if (widget && !ispec.element.isEmpty()
-          && !widget->windowFlags().testFlag(Qt::FramelessWindowHint)) // not a panel)
+          && !widget->windowFlags().testFlag(Qt::FramelessWindowHint)) // not a panel
       {
         if (QWidget *child = widget->childAt(0,0))
         {
           if (qobject_cast<QMenuBar*>(child) || qobject_cast<QToolBar*>(child))
           {
-            ispec = getInteriorSpec(KSL("Window"));
-            sspec = getSizeSpec(KSL("Window"));
+            if (widget && translucentWidgets_.contains(widget))
+            {
+              ispec = getInteriorSpec(KSL("WindowTranslucent"));
+              sspec = getSizeSpec(KSL("WindowTranslucent"));
+              if (ispec.element.isEmpty())
+              {
+                ispec = getInteriorSpec(KSL("Window"));
+                sspec = getSizeSpec(KSL("Window"));
+              }
+            }
+            else
+            {
+              ispec = getInteriorSpec(KSL("Window"));
+              sspec = getSizeSpec(KSL("Window"));
+            }
           }
         }
       }
       else
       {
-        ispec = getInteriorSpec(KSL("Window"));
-        sspec = getSizeSpec(KSL("Window"));
+        if (widget && translucentWidgets_.contains(widget))
+        {
+          ispec = getInteriorSpec(KSL("WindowTranslucent"));
+          sspec = getSizeSpec(KSL("WindowTranslucent"));
+          if (ispec.element.isEmpty())
+          {
+            ispec = getInteriorSpec(KSL("Window"));
+            sspec = getSizeSpec(KSL("Window"));
+          }
+        }
+        else
+        {
+          ispec = getInteriorSpec(KSL("Window"));
+          sspec = getSizeSpec(KSL("Window"));
+        }
       }
       frame_spec fspec;
       default_frame_spec(fspec);

diff --git a/Kvantum/style/polishing.cpp b/Kvantum/style/polishing.cpp
@@ -391,8 +391,8 @@ void Style::polish(QWidget *widget)
                  but exclude the opaque list */
               || (!isOpaque_ && tspec_now.composite
                   && (hspec_.blur_translucent
-                      /* let unusual tooltips with hard-coded translucency
-                         have shadow (like in LXQtGroupPopup or KDE system settings) */
+                      /* include unusual tooltips with hard-coded translucency (like in
+                         LXQtGroupPopup or KDE system settings) into translucentWidgets_ */
                       || (widget->windowFlags() & Qt::WindowType_Mask) == Qt::ToolTip)
                   && widget->testAttribute(Qt::WA_TranslucentBackground)))
           {
@@ -407,9 +407,7 @@ void Style::polish(QWidget *widget)
             }
 
             /* enable blurring */
-            if ((!makeTranslucent
-                 && (hspec_.blur_translucent || tspec_now.popup_blurring))
-                || tspec_now.blurring)
+            if (makeTranslucent ? tspec_now.blurring : hspec_.blur_translucent)
             {
               if (blurHelper_ == nullptr)
               {