fix: navigate back after wallpaper selected
This commit is contained in:
parent
da3b58118f
commit
19a8f4ad45
2 changed files with 17 additions and 4 deletions
|
|
@ -1,3 +1,5 @@
|
||||||
|
pragma ComponentBehavior: Bound
|
||||||
|
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Caelestia.Config
|
import Caelestia.Config
|
||||||
|
|
@ -31,7 +33,11 @@ PageBase {
|
||||||
|
|
||||||
source: modelData.path
|
source: modelData.path
|
||||||
text: modelData.name
|
text: modelData.name
|
||||||
onClicked: Wallpapers.setWallpaper(modelData.path)
|
onClicked: {
|
||||||
|
Wallpapers.setWallpaper(modelData.path);
|
||||||
|
root.nState.closeSubPage();
|
||||||
|
root.nState.closeSubPage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,10 @@ PageBase {
|
||||||
title: qsTr("Select an image")
|
title: qsTr("Select an image")
|
||||||
filterLabel: qsTr("Image files")
|
filterLabel: qsTr("Image files")
|
||||||
filters: Images.validImageExtensions
|
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
|
horizontalPadding: Tokens.padding.extraLarge
|
||||||
verticalPadding: Tokens.padding.medium
|
verticalPadding: Tokens.padding.medium
|
||||||
type: IconTextButton.Tonal
|
type: IconTextButton.Tonal
|
||||||
onClicked: Wallpapers.setRandom()
|
onClicked: {
|
||||||
|
Wallpapers.setRandom();
|
||||||
|
root.nState.closeSubPage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,9 +119,10 @@ PageBase {
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (modelData.parentDir !== Paths.wallsdir) {
|
if (modelData.parentDir !== Paths.wallsdir) {
|
||||||
root.nState.selectedWallpaperCategory = Wallpapers.getCategoryFor(modelData);
|
root.nState.selectedWallpaperCategory = Wallpapers.getCategoryFor(modelData);
|
||||||
root.nState.openSubPage(2);
|
root.nState.openSubPage(2); // Category page
|
||||||
} else {
|
} else {
|
||||||
Wallpapers.setWallpaper(modelData.path);
|
Wallpapers.setWallpaper(modelData.path);
|
||||||
|
root.nState.closeSubPage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue