Merge branch 'v5' of github.com:noctalia-dev/noctalia-shell into v5

.github/workflows/cachix.yml

@@ -0,0 +1,26 @@
+name: cachix
+
+on:
+  push:
+    branches:
+      - v5
+  workflow_run:
+    workflows: ["update flake"]
+    types:
+      - completed
+    branches:
+      - v5
+  workflow_dispatch:
+
+jobs:
+  cache:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'noctalia-dev/noctalia-shell' }}
+    steps:
+      - uses: actions/checkout@v6
+      - uses: cachix/install-nix-action@v31
+      - uses: cachix/cachix-action@v17
+        with:
+          name: "${{ secrets.CACHIX_CACHE_NAME }}"
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+      - run: nix build .

.github/workflows/update-flake.yml

@@ -0,0 +1,20 @@
+name: update flake
+
+on:
+  schedule:
+    - cron: "0 0 * * 0"
+  workflow_dispatch:
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'noctalia-dev/noctalia-shell' }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v6
+      - uses: cachix/install-nix-action@v31
+      - run: nix flake update
+      - uses: stefanzweifel/git-auto-commit-action@v7
+        with:
+          commit_message: "chore(flake): update flake.lock"

src/shell/bar/bar.cpp

@@ -1103,8 +1103,11 @@ void Bar::attachWidgetsToSections(BarInstance& instance) {
     auto canJoinCapsuleGroup = [](const Widget& first, const Widget& next) {
       const auto& firstSpec = first.barCapsuleSpec();
       const auto& nextSpec = next.barCapsuleSpec();
+      const bool sameCapsuleStyle =
+          firstSpec.fill == nextSpec.fill && firstSpec.group == nextSpec.group && firstSpec.border == nextSpec.border &&
+          firstSpec.foreground == nextSpec.foreground && firstSpec.opacity == nextSpec.opacity;
       return firstSpec.enabled && nextSpec.enabled && !first.isAnchor() && !next.isAnchor() &&
-             !firstSpec.group.empty() && firstSpec == nextSpec && first.contentScale() == next.contentScale();
+             !firstSpec.group.empty() && sameCapsuleStyle && first.contentScale() == next.contentScale();
     };
 
     std::size_t index = 0;
@@ -1172,6 +1175,7 @@ void Bar::attachWidgetsToSections(BarInstance& instance) {
 
       for (std::size_t memberIndex = index; memberIndex < runEnd; ++memberIndex) {
         auto& member = widgets[memberIndex];
+        run.spec.padding = std::max(run.spec.padding, member->barCapsuleSpec().padding);
         member->setBarCapsuleScene(shellPtr, bgPtr);
         run.widgets.push_back(member.get());
         innerPtr->addChild(member->releaseRoot());