Merge branch 'main' into module/wifi

Modules/Bar/Popouts/Content.qml

@@ -103,10 +103,10 @@ Item {
 		readonly property bool shouldBeActive: root.popouts.currentName === name
 
 		active: false
-		// anchors.horizontalCenter: parent.horizontalCenter
-		// anchors.top: parent.top
-		// anchors.topMargin: 5
-		anchors.centerIn: parent
+		anchors.centerIn: opacity === 1 ? undefined : parent
+		anchors.horizontalCenter: parent.horizontalCenter
+		anchors.top: opacity === 1 ? parent.top : undefined
+		anchors.topMargin: 5
 		opacity: 0
 		scale: 0.8
 

Modules/Bar/Popouts/Wrapper.qml

@@ -54,7 +54,7 @@ Item {
 	Comp {
 		id: content
 
-		anchors.centerIn: parent
+		anchors.fill: parent
 		shouldBeActive: root.hasCurrent
 
 		sourceComponent: Content {

Modules/Launcher/CarouselView.qml

@@ -15,6 +15,10 @@ CarouselView {
 	readonly property var values: Wallpapers.query(root.search.text.split(" ").slice(1).join(" "))
 	required property var visibilities
 
+	currentIndex: {
+		const idx = Wallpapers.list.findIndex(w => w.path === Wallpapers.actualCurrent);
+		return idx >= 0 ? idx : 0;
+	}
 	delegateProperties: ({
 			visibilities: root.visibilities
 		})
@@ -41,13 +45,9 @@ CarouselView {
 		}
 	}
 
-	Component.onCompleted: {
-		const idx = Wallpapers.list.findIndex(w => w.path === Wallpapers.actualCurrent);
-		if (idx >= 0)
-			jumpToIndex(idx);
-	}
 	Component.onDestruction: Wallpapers.stopPreview()
-	onPreviewIndexChanged: (realIndex, modelData) => {
-		Wallpapers.preview(modelData.path);
+	onCurrentItemChanged: {
+		if (currentItem)
+			Wallpapers.preview(currentItem.modelData.path);
 	}
 }