Merge pull request #225 from Bali10050/feature

Feature

Author: Bali10050

.github/workflows/darkly-ci.yml

@@ -84,3 +84,10 @@ jobs:
     uses: ./.github/workflows/archlinux.yml
     with:
       version: ${{ needs.release-ci.outputs.VERSION }}
+
+  Flatpak:
+    needs: release-ci
+    uses: ./.github/workflows/flatpak.yml
+    with:
+      cache-file-path: ${{ needs.release-ci.outputs.ASSET }}
+      version: ${{ needs.release-ci.outputs.VERSION }}

.github/workflows/flatpak.yml

@@ -0,0 +1,54 @@
+# Flatpak build support
+on:
+  workflow_call:
+    inputs:
+      cache-file-path:
+        required: true
+        type: string
+      version:
+        required: true
+        type: string
+env:
+  QT6_RUNTIME_VERSION: 6.9
+  QT5_RUNTIME_VERSION: 5.15-24.08
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/cache/restore@v4
+        with:
+          key: ${{ runner.os }}-v${{ inputs.version }}-${{ hashFiles(inputs.cache-file-path) }}
+          path: ${{ inputs.cache-file-path }}
+          fail-on-cache-miss: true
+      - name: Install build dependencies
+        run: |
+          sudo apt update -y
+          sudo apt dist-upgrade -y
+          sudo apt install flatpak flatpak-builder git -y
+      - name: Extract release tarball
+        run: tar xvf ${{ inputs.cache-file-path }}
+      - name: Flatpak remote-add flathub
+        run: sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+      - name: Flatpak build setup - QT6
+        run: |
+          sudo flatpak install org.kde.Sdk/x86_64/${{ env.QT6_RUNTIME_VERSION }} -y
+          sudo flatpak install org.kde.Platform/x86_64/${{ env.QT6_RUNTIME_VERSION }} -y
+      - name: Flatpak build setup - QT5
+        run: |
+          sudo flatpak install org.kde.Sdk/x86_64/${{ env.QT5_RUNTIME_VERSION }} -y
+          sudo flatpak install org.kde.Platform/x86_64/${{ env.QT5_RUNTIME_VERSION }} -y
+      - name: Flatpak build & bundle - QT6
+        run: |
+          sudo flatpak-builder flatpak-build --repo=local --force-clean --ccache Darkly-${{inputs.version}}/org.kde.KStyle.Darkly6.json
+          sudo flatpak build-bundle local/ darkly-qt${{ env.QT6_RUNTIME_VERSION }}-${{ inputs.version }}-x86_64.flatpak runtime/org.kde.KStyle.Darkly/x86_64/${{ env.QT6_RUNTIME_VERSION }}
+      - name: Flatpak build & bundle - QT5
+        run: |
+          sudo flatpak-builder flatpak-build --repo=local --force-clean --ccache Darkly-${{inputs.version}}/org.kde.KStyle.Darkly5.json
+          sudo flatpak build-bundle local/ darkly-qt${{ env.QT5_RUNTIME_VERSION }}-${{ inputs.version }}-x86_64.flatpak runtime/org.kde.KStyle.Darkly/x86_64/${{ env.QT5_RUNTIME_VERSION }}
+      - name: Release
+        uses: softprops/action-gh-release@v2.0.8
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            darkly-qt${{ env.QT6_RUNTIME_VERSION }}-${{ inputs.version }}-x86_64.flatpak
+            darkly-qt${{ env.QT5_RUNTIME_VERSION }}-${{ inputs.version }}-x86_64.flatpak

VERSION

@@ -1 +1 @@
-0.5.22
+0.5.23

kstyle/darklyblurhelper.cpp

@@ -338,30 +338,32 @@ QRegion BlurHelper::blurTabWidgetRegion(QWidget *widget) const
 QRegion BlurHelper::blurSettingsDialogRegion(QWidget *widget) const
 {
     QRegion region;
-    QList<QWidget *> widgets = widget->findChildren<QWidget *>();
 
     // settings only change it for konsole or dolphin about window
     if ((widget->windowFlags() & Qt::WindowType_Mask) == Qt::Dialog
         && (widget->inherits("KAboutApplicationDialog") || widget->inherits("KDEPrivate::KAboutKdeDialog"))) {
-        for (auto w : widgets) {
-            if (qobject_cast<QTabWidget *>(w) && (widget->inherits("KAboutApplicationDialog") || widget->inherits("KDEPrivate::KAboutKdeDialog"))) {
-                // about dialog
-                const QTabWidget *tw = qobject_cast<QTabWidget *>(w);
-                QSize tbSize(tw->rect().size());
-                // the blur region is too small without adjusting the height of the tabbar height
-                tbSize.setHeight(tw->tabBar()->rect().height() + 4);
-                region += roundedRegion(QRect(tw->pos(), tbSize), StyleConfigData::cornerRadius(), false, false, true, false);
-            } else {
-                // settings main dialog
-                region += roundedRegion(QRect(w->mapToGlobal(w->pos()), w->rect().size()), StyleConfigData::cornerRadius(), false, false, true, false);
-            }
-            if (w->inherits("KPageWidget")) {
-                // sidebar
-                QList<QWidget *> KPageWidgets = w->findChildren<QWidget *>(QString(), Qt::FindDirectChildrenOnly);
-                for (auto wid : KPageWidgets) {
-                    if (wid->property(PropertyNames::sidePanelView).toBool()) {
-                        region += roundedRegion(QRect(wid->pos(), wid->rect().size()), StyleConfigData::cornerRadius(), false, false, true, false);
-                        break;
+        QList<QWidget *> widgets = widget->findChildren<QWidget *>();
+        if (widgets.length() > 0) {
+            for (auto w : widgets) {
+                if (qobject_cast<QTabWidget *>(w) && (widget->inherits("KAboutApplicationDialog") || widget->inherits("KDEPrivate::KAboutKdeDialog"))) {
+                    // about dialog
+                    const QTabWidget *tw = qobject_cast<QTabWidget *>(w);
+                    QSize tbSize(tw->rect().size());
+                    // the blur region is too small without adjusting the height of the tabbar height
+                    tbSize.setHeight(tw->tabBar()->rect().height() + 4);
+                    region += roundedRegion(QRect(tw->pos(), tbSize), StyleConfigData::cornerRadius(), false, false, true, false);
+                } else {
+                    // settings main dialog
+                    region += roundedRegion(QRect(w->mapToGlobal(w->pos()), w->rect().size()), StyleConfigData::cornerRadius(), false, false, true, false);
+                }
+                if (w->inherits("KPageWidget")) {
+                    // sidebar
+                    QList<QWidget *> KPageWidgets = w->findChildren<QWidget *>(QString(), Qt::FindDirectChildrenOnly);
+                    for (auto wid : KPageWidgets) {
+                        if (wid->property(PropertyNames::sidePanelView).toBool()) {
+                            region += roundedRegion(QRect(wid->pos(), wid->rect().size()), StyleConfigData::cornerRadius(), false, false, true, false);
+                            break;
+                        }
                     }
                 }
             }

org.kde.KStyle.Darkly6.json

@@ -1,10 +1,10 @@
 {
   "id": "org.kde.KStyle.Darkly",
-  "branch": "6.8",
+  "branch": "6.9",
   "runtime": "org.kde.Platform",
   "build-extension": true,
   "sdk": "org.kde.Sdk",
-  "runtime-version": "6.8",
+  "runtime-version": "6.9",
   "appstream-compose": false,
   "separate-locales": false,
   "modules": [