From 19a8f4ad458ae93b0faee84d2c067002c76ab64b Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Fri, 5 Jun 2026 22:15:43 +1000
Subject: [PATCH] fix: navigate back after wallpaper selected

---
 .../nexus/pages/wallandstyle/WallpaperCategory.qml  |  8 +++++++-
 .../nexus/pages/wallandstyle/WallpaperSelect.qml    | 13 ++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/nexus/pages/wallandstyle/WallpaperCategory.qml b/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
index 891df158..88d4e581 100644
--- a/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
+++ b/modules/nexus/pages/wallandstyle/WallpaperCategory.qml
@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
@@ -31,7 +33,11 @@ PageBase {
 
                 source: modelData.path
                 text: modelData.name
-                onClicked: Wallpapers.setWallpaper(modelData.path)
+                onClicked: {
+                    Wallpapers.setWallpaper(modelData.path);
+                    root.nState.closeSubPage();
+                    root.nState.closeSubPage();
+                }
             }
         }
     }
diff --git a/modules/nexus/pages/wallandstyle/WallpaperSelect.qml b/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
index fb98333d..f4e099d0 100644
--- a/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
+++ b/modules/nexus/pages/wallandstyle/WallpaperSelect.qml
@@ -45,7 +45,10 @@ PageBase {
                     title: qsTr("Select an image")
                     filterLabel: qsTr("Image files")
                     filters: Images.validImageExtensions
-                    onAccepted: path => Wallpapers.setWallpaper(path)
+                    onAccepted: path => {
+                        Wallpapers.setWallpaper(path);
+                        root.nState.closeSubPage();
+                    }
                 }
             }
 
@@ -58,7 +61,10 @@ PageBase {
                 horizontalPadding: Tokens.padding.extraLarge
                 verticalPadding: Tokens.padding.medium
                 type: IconTextButton.Tonal
-                onClicked: Wallpapers.setRandom()
+                onClicked: {
+                    Wallpapers.setRandom();
+                    root.nState.closeSubPage();
+                }
             }
         }
 
@@ -113,9 +119,10 @@ PageBase {
                     onClicked: {
                         if (modelData.parentDir !== Paths.wallsdir) {
                             root.nState.selectedWallpaperCategory = Wallpapers.getCategoryFor(modelData);
-                            root.nState.openSubPage(2);
+                            root.nState.openSubPage(2); // Category page
                         } else {
                             Wallpapers.setWallpaper(modelData.path);
+                            root.nState.closeSubPage();
                         }
                     }
                 }