fix: changesMade bool now binding for robustness

Modules/Settings/Common/WallpaperCropper.qml

@@ -16,8 +16,20 @@ Item {
 	readonly property var currentScreen: screens.length > selectedScreenIndex ? screens[selectedScreenIndex] : null
 	readonly property real maxZoom: 5.0
 
+	readonly property bool changesMade: {
+		cropRevision;
+
+		const r = cropRectLoader.item;
+		if (!r || !currentScreen || scaledImg.status !== Image.Ready)
+			return false;
+
+		const t = r.savedTarget();
+
+		return Math.abs(r.x - t.x) > 0.5 || Math.abs(r.y - t.y) > 0.5 || Math.abs(r.zoom - t.zoom) > 0.001;
+	}
+
+	property int cropRevision: 0
 	property int buttonRowHeight: Tokens.padding.large * 3
-	property bool changesMade: false
 	property var screens: []
 	property int selectedScreenIndex: 0
 	property bool shouldBeActive: true
@@ -42,6 +54,7 @@ Item {
 		const cropHeightPercent = cropRect.height / cropRect.imageH;
 
 		Wallpapers.setCrop(currentScreen.name, Qt.rect(cropXPercent, cropYPercent, cropWidthPercent, cropHeightPercent), cropRect.zoom);
+		cropRevision++;
 	}
 
 	function refreshScreens(): void {
@@ -161,8 +174,6 @@ Item {
 			onInteraction: value => {
 				wrapper.zoomClipRect(wrapper.zoomFromSlider(value));
 			}
-
-			onPosChanged: wrapper.changesMade = true
 		}
 
 		ButtonRow {
@@ -181,7 +192,6 @@ Item {
 
 				onClicked: {
 					wrapper.syncCropToScreen();
-					wrapper.changesMade = false;
 				}
 			}
 
@@ -198,7 +208,6 @@ Item {
 
 				onClicked: {
 					wrapper.applyCrop();
-					wrapper.changesMade = false;
 				}
 			}
 		}
@@ -318,19 +327,33 @@ Item {
 							y = Math.max(imageY, Math.min(y, imageY + imageH - height));
 						}
 
-						function restoreFromData() {
+						// Where the rect should be according to saved data (same rules as a restore).
-							let data = Wallpapers.getCrop(wrapper.currentScreen.name);
+						function savedTarget() {
+							const data = Wallpapers.getCrop(wrapper.currentScreen.name);
+							const hasCrop = data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001);
 
-							if (data && (Math.abs(data.x) > 0.001 || Math.abs(data.y) > 0.001 || Math.abs(data.width - 1.0) > 0.001 || Math.abs(data.height - 1.0) > 0.001)) {
+							const z = hasCrop && data.zoom > 0 ? data.zoom : 1.0;
-								zoom = data.zoom > 0 ? data.zoom : 1.0;
+							const w = Math.round(baseWidth / z);
-								x = Math.round(imageX + (data.x * imageW));
+							const h = Math.round(baseHeight / z);
-								y = Math.round(imageY + (data.y * imageH));
 
-								clampToBounds();
+							let tx = hasCrop ? Math.round(imageX + data.x * imageW) : Math.round(imageX + (imageW - w) / 2);
-							} else {
+							let ty = hasCrop ? Math.round(imageY + data.y * imageH) : Math.round(imageY + (imageH - h) / 2);
-								zoom = 1.0;
+
-								centerInImage();
+							tx = Math.max(imageX, Math.min(tx, imageX + imageW - w));
+							ty = Math.max(imageY, Math.min(ty, imageY + imageH - h));
+
+							return {
+								x: tx,
+								y: ty,
+								zoom: z
+							};
 						}
+
+						function restoreFromData() {
+							const t = savedTarget();
+							zoom = t.zoom;
+							x = t.x;
+							y = t.y;
 						}
 
 						height: Math.round(baseHeight / zoom)
@@ -424,7 +447,6 @@ Item {
 				onPositionChanged: mouse => {
 					if (pressed) {
 						updateCrop(mouse.x, mouse.y);
-						wrapper.changesMade = true;
 					}
 				}
 				onPressed: mouse => {