launcher: fix wallpaper preview colours
Also disable transparency action (not impled and won't be in the near future)
This commit is contained in:
parent
ee0f243ca3
commit
e373fe0375
4 changed files with 11 additions and 18 deletions
|
|
@ -42,6 +42,7 @@ Singleton {
|
|||
name: qsTr("Transparency")
|
||||
desc: qsTr("Change shell transparency")
|
||||
icon: "opacity"
|
||||
disabled: true
|
||||
|
||||
function onClicked(list: AppList): void {
|
||||
root.autocomplete(list, "transparency");
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ Item {
|
|||
const currentItem = list.currentList?.currentItem;
|
||||
if (currentItem) {
|
||||
if (list.showWallpapers) {
|
||||
if (currentItem.modelData.path !== Wallpapers.actualCurrent)
|
||||
Wallpapers.previewColourLock = true;
|
||||
Wallpapers.setWallpaper(currentItem.modelData.path);
|
||||
root.visibilities.launcher = false;
|
||||
} else if (text.startsWith(Config.launcher.actionPrefix)) {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ Singleton {
|
|||
readonly property list<string> colourNames: ["rosewater", "flamingo", "pink", "mauve", "red", "maroon", "peach", "yellow", "green", "teal", "sky", "sapphire", "blue", "lavender"]
|
||||
|
||||
property bool showPreview
|
||||
property bool endPreviewOnNextChange
|
||||
property bool light
|
||||
readonly property Colours palette: showPreview ? preview : current
|
||||
readonly property Colours current: Colours {}
|
||||
|
|
@ -45,11 +44,6 @@ Singleton {
|
|||
if (colours.hasOwnProperty(propName))
|
||||
colours[propName] = `#${colour}`;
|
||||
}
|
||||
|
||||
if (!isPreview || (isPreview && endPreviewOnNextChange)) {
|
||||
showPreview = false;
|
||||
endPreviewOnNextChange = false;
|
||||
}
|
||||
}
|
||||
|
||||
function setMode(mode: string): void {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ Singleton {
|
|||
readonly property string current: showPreview ? previewPath : actualCurrent
|
||||
property string previewPath
|
||||
property string actualCurrent
|
||||
property bool previewColourLock
|
||||
|
||||
readonly property list<var> preppedWalls: list.map(w => ({
|
||||
name: Fuzzy.prepare(w.name),
|
||||
|
|
@ -35,8 +36,7 @@ Singleton {
|
|||
|
||||
function setWallpaper(path: string): void {
|
||||
actualCurrent = path;
|
||||
setWall.path = path;
|
||||
setWall.startDetached();
|
||||
Quickshell.execDetached(["caelestia", "wallpaper", "-f", path]);
|
||||
}
|
||||
|
||||
function preview(path: string): void {
|
||||
|
|
@ -47,7 +47,8 @@ Singleton {
|
|||
|
||||
function stopPreview(): void {
|
||||
showPreview = false;
|
||||
Colours.endPreviewOnNextChange = true;
|
||||
if (!previewColourLock)
|
||||
Colours.showPreview = false;
|
||||
}
|
||||
|
||||
reloadableId: "wallpapers"
|
||||
|
|
@ -72,7 +73,10 @@ Singleton {
|
|||
path: root.currentNamePath
|
||||
watchChanges: true
|
||||
onFileChanged: reload()
|
||||
onLoaded: root.actualCurrent = text().trim()
|
||||
onLoaded: {
|
||||
root.actualCurrent = text().trim();
|
||||
root.previewColourLock = false;
|
||||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
|
|
@ -87,14 +91,6 @@ Singleton {
|
|||
}
|
||||
}
|
||||
|
||||
Process {
|
||||
id: setWall
|
||||
|
||||
property string path
|
||||
|
||||
command: ["caelestia", "wallpaper", "-f", path]
|
||||
}
|
||||
|
||||
Process {
|
||||
running: true
|
||||
command: ["find", root.path, "-type", "d", "-path", '*/.*', "-prune", "-o", "-not", "-name", '.*', "-type", "f", "-print"]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue