move carouselview to standalone c++ component, fix crash due to memory leak in wallpaper object creation
C++ / fmt (pull_request) Successful in 3s
JS/TS / lint (pull_request) Successful in 18s
JS/TS / fmt (pull_request) Successful in 17s
Python / fmt (pull_request) Successful in 28s
Python / lint (pull_request) Successful in 30s
Python / test (pull_request) Successful in 1m5s
Python / typecheck (pull_request) Successful in 1m24s
Rust / fmt (pull_request) Successful in 31s
C++ / build (pull_request) Successful in 2m21s
Rust / build (pull_request) Successful in 1m47s
Python / buildcheck (pull_request) Successful in 2m18s
Rust / clippy (pull_request) Successful in 1m12s
C++ / clang-tidy (pull_request) Successful in 4m3s
C++ / fmt (pull_request) Successful in 3s
JS/TS / lint (pull_request) Successful in 18s
JS/TS / fmt (pull_request) Successful in 17s
Python / fmt (pull_request) Successful in 28s
Python / lint (pull_request) Successful in 30s
Python / test (pull_request) Successful in 1m5s
Python / typecheck (pull_request) Successful in 1m24s
Rust / fmt (pull_request) Successful in 31s
C++ / build (pull_request) Successful in 2m21s
Rust / build (pull_request) Successful in 1m47s
Python / buildcheck (pull_request) Successful in 2m18s
Rust / clippy (pull_request) Successful in 1m12s
C++ / clang-tidy (pull_request) Successful in 4m3s
This commit is contained in:
@@ -5,103 +5,46 @@ import Quickshell.Hyprland
|
||||
import QtQuick
|
||||
import qs.Components
|
||||
import qs.Helpers
|
||||
import ZShell.Config
|
||||
import ZShell.Internal
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
||||
property bool completed
|
||||
property real cropHeight: displayData?.height ?? 1.0
|
||||
property real cropWidth: displayData?.width ?? 1.0
|
||||
property real cropX: displayData?.x ?? 0.0
|
||||
property real cropY: displayData?.y ?? 0.0
|
||||
property WallpaperImage current
|
||||
readonly property var displayData: Wallpapers.getCrop(screen.name)
|
||||
required property ShellScreen screen
|
||||
property size screenResolution: Qt.size(screen.width * screenScale, screen.height * screenScale)
|
||||
property real screenScale: Hyprland.monitorFor(screen).scale
|
||||
property string source: Wallpapers.current
|
||||
|
||||
anchors.fill: parent
|
||||
|
||||
Component.onCompleted: {
|
||||
Hyprland.refreshMonitors();
|
||||
Component.onCompleted: Hyprland.refreshMonitors()
|
||||
|
||||
if (source)
|
||||
Qt.callLater(() => {
|
||||
current = imgComp.createObject(this, {
|
||||
source
|
||||
});
|
||||
completed = true;
|
||||
});
|
||||
}
|
||||
onSourceChanged: {
|
||||
if (!source)
|
||||
current = null;
|
||||
else
|
||||
current = imgComp.createObject(this, {
|
||||
source: source
|
||||
});
|
||||
}
|
||||
WallpaperImage {
|
||||
id: img
|
||||
|
||||
Component {
|
||||
id: imgComp
|
||||
anchors.fill: parent
|
||||
cropHeight: root.displayData?.height ?? 1.0
|
||||
cropWidth: root.displayData?.width ?? 1.0
|
||||
cropX: root.displayData?.x ?? 0.0
|
||||
cropY: root.displayData?.y ?? 0.0
|
||||
fadeDuration: 150
|
||||
screenResolution: root.screenResolution
|
||||
source: Wallpapers.current
|
||||
|
||||
WallpaperImage {
|
||||
id: img
|
||||
|
||||
anchors.fill: parent
|
||||
cropHeight: root.cropHeight
|
||||
cropWidth: root.cropWidth
|
||||
cropX: root.cropX
|
||||
cropY: root.cropY
|
||||
opacity: 0
|
||||
screenResolution: root.screenResolution
|
||||
source: root.source
|
||||
|
||||
Behavior on cropHeight {
|
||||
Anim {
|
||||
id: heightAnim
|
||||
}
|
||||
Behavior on cropHeight {
|
||||
Anim {
|
||||
}
|
||||
Behavior on cropWidth {
|
||||
Anim {
|
||||
id: widthAnim
|
||||
}
|
||||
}
|
||||
Behavior on cropWidth {
|
||||
Anim {
|
||||
}
|
||||
Behavior on cropX {
|
||||
Anim {
|
||||
id: xAnim
|
||||
}
|
||||
}
|
||||
Behavior on cropX {
|
||||
Anim {
|
||||
}
|
||||
Behavior on cropY {
|
||||
Anim {
|
||||
id: yAnim
|
||||
}
|
||||
}
|
||||
Anim on opacity {
|
||||
id: anim
|
||||
|
||||
from: 0
|
||||
running: false
|
||||
to: 1
|
||||
type: Anim.SlowEffects
|
||||
}
|
||||
|
||||
onStatusChanged: {
|
||||
if (status === Image.Ready) {
|
||||
anim.start();
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: destroyTimer
|
||||
|
||||
interval: anim.duration * 2
|
||||
running: root.current !== img && root.current?.status === Image.Ready
|
||||
|
||||
onTriggered: Qt.callLater(() => img.destroy())
|
||||
}
|
||||
Behavior on cropY {
|
||||
Anim {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user