Clean up

Zachjittery pog

.gitignore

@@ -0,0 +1,4 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug
+target

Modules/ConfigLoader.qml

@@ -0,0 +1,56 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell.Io
+import Quickshell
+
+Singleton {
+	id: root
+
+	property string configDir: Quickshell.env("HOME") + "/.config/I-DeskPet"
+	property string configPath: configDir + "/config.json"
+	property alias gifFolder: adapter.gifFolder
+	property alias maxScaling: adapter.maxScale
+
+	Process {
+		id: dirCheck
+
+		command: ["test", "-d", root.configDir]
+		running: true
+
+		onExited: function (exitCode) {
+			if (exitCode !== 0) {
+				console.log("creating dir");
+				dirCreate.running = true;
+			}
+		}
+	}
+
+	Process {
+		id: dirCreate
+
+		command: ["mkdir", "-p", root.configDir]
+		running: false
+
+		onExited: function (): void {
+			console.log("Created config directory:", root.configDir);
+		}
+	}
+
+	FileView {
+		id: watcher
+
+		path: root.configPath
+		watchChanges: true
+
+		onAdapterUpdated: writeAdapter()
+		onFileChanged: reload()
+
+		JsonAdapter {
+			id: adapter
+
+			property string gifFolder: Quickshell.shellDir + "/Gifs"
+			property real maxScale: 1
+		}
+	}
+}

Modules/GetGifs.qml

@@ -0,0 +1,20 @@
+import QtQuick
+import Qt.labs.folderlistmodel
+
+Item {
+	id: root
+
+	property alias count: folderModel.count
+	required property string gifFolder
+	property alias gifsModel: folderModel
+
+	FolderListModel {
+		id: folderModel
+
+		folder: "file://" + root.gifFolder
+		nameFilters: ["*.gif"]
+		showDirs: false
+		showHidden: false
+		sortField: FolderListModel.Name
+	}
+}

Modules/GifsLoader.qml

@@ -0,0 +1,88 @@
+pragma ComponentBehavior: Bound
+
+import QtQuick
+import Quickshell
+import Quickshell.Io
+import Qt.labs.folderlistmodel
+import qs.Modules
+
+Repeater {
+	id: gifRepeater
+
+	required property FolderListModel gifsModel
+
+	model: gifsModel
+
+	Item {
+		id: gifItem
+
+		required property string fileBaseName
+		required property url fileUrl
+		property alias hovered: mouse.containsMouse
+		required property int index
+		property bool loaded: false
+		property alias zIndex: gifSaved.zIndex
+
+		height: Math.floor(gif.sourceSize.height / gifSaved.scaling)
+		visible: gifItem.loaded
+		width: Math.floor(gif.sourceSize.width / gifSaved.scaling)
+		z: gifSaved.zIndex
+
+		onXChanged: if (gifItem.loaded)
+			gifSaved.positionX = gifItem.x
+		onYChanged: if (gifItem.loaded)
+			gifSaved.positionY = gifItem.y
+
+		AnimatedImage {
+			id: gif
+
+			anchors.fill: parent
+			fillMode: Image.PreserveAspectFit
+			source: gifItem.fileUrl
+		}
+
+		Mouse {
+			id: mouse
+
+			onDoubleClicked: gifSaved.scaling = 1
+			onWheel: wheel => {
+				gifSaved.scaling = Math.max(ConfigLoader.maxScaling, (gifSaved.scaling + 0.1 * (wheel.angleDelta.y / 120)));
+			}
+		}
+
+		FileView {
+			id: watcher
+
+			property string configDir: Quickshell.env("HOME") + "/.config/I-DeskPet/"
+			property string configPath: configDir + name
+			property string name: gifItem.fileBaseName + ".json"
+
+			path: configPath
+			watchChanges: true
+
+			onAdapterUpdated: writeAdapter()
+			onFileChanged: reload()
+			onLoadFailed: {
+				gifSaved.zIndex = gifItem.index;
+				writeAdapter();
+				gifItem.loaded = true;
+			}
+			onLoaded: {
+				if (gifSaved.zIndex === -1)
+					gifSaved.zIndex = gifItem.index;
+				gifItem.x = gifSaved.positionX;
+				gifItem.y = gifSaved.positionY;
+				gifItem.loaded = true;
+			}
+
+			JsonAdapter {
+				id: gifSaved
+
+				property int positionX: 0
+				property int positionY: 0
+				property real scaling: 1
+				property int zIndex: -1
+			}
+		}
+	}
+}

Modules/Mouse.qml

@@ -0,0 +1,13 @@
+import QtQuick
+
+MouseArea {
+	acceptedButtons: Qt.LeftButton
+	anchors.fill: parent
+	drag.axis: Drag.XAndYAxis
+	drag.maximumX: Screen.width - parent.width
+	drag.maximumY: Screen.height - parent.height
+	drag.minimumX: 0
+	drag.minimumY: 0
+	drag.target: parent
+	hoverEnabled: true
+}

README.md

@@ -1 +1,63 @@
-### Pet March (Evernight)
+<div align="Center">
+ <h3> Pet March (Evernight) </h3>
+ <p>My selfmade desktop pet using QT </p>
+ <img src=./Assets/Evernight.gif style="margin: 0px 30px 0px 0px;" />
+</div>
+
+## Feature list
+
+- [x] Hyprland keybind support
+  - [x] Toggle layer ontop/bottom
+  - [x] Toggle active mouse area
+- [x] Dynamic path + live update
+- [x] Supports multiple gifs
+- [x] User config options
+- [x] Evernight base gif img
+
+# Config
+
+Configuration is found at:
+
+```zsh
+~/.config/I-DeskPet
+```
+
+Options:
+
+- gifFolder
+- maxScaling
+
+Example for config.json:
+
+```json
+{
+  "gifFolder": "/home/inorishio/Pictures/Pets",
+  "maxScaling": 1
+}
+```
+
+# Hyprland keybinds
+
+Toggle click through
+
+```zsh
+bind = CTRL, mouse:274, global, I-DeskPet:toggle-Region
+```
+
+Toggle between having your gif on your background vs foreground
+
+```zsh
+bind = SHIFT, mouse:274, global, I-DeskPet:toggle-Layer
+```
+
+Keybind for cycling through gif layering.
+Hover over which gif you want to cycle it's layer for and use the keybind.
+
+```zsh
+bind = $mainMod, Z, global, I-DeskPet:cycle-zIndex
+```
+
+# Other keybinds
+
+- Double click = Reset gif size to original
+- Scroll = Scales the gif up and or down

shell.qml

@@ -1,56 +1,183 @@
 pragma ComponentBehavior: Bound
+
 import QtQuick
 import Quickshell
+import Quickshell.Io
 import Quickshell.Wayland
-//import qs.Gifs
+import Quickshell.Hyprland
+import qs.Modules
 
 PanelWindow {
 	id: mainWindow
-    WlrLayershell.layer: WlrLayer.Top
+
+	property var noMove: Region {
+	}
+	property bool onTop: true
+	property var petMove: Region {
+		id: pets
+
+		height: Screen.height
+		intersection: Intersection.Xor
+		regions: maskVariants.instances
+		width: Screen.width
+	}
+	property list<Item> repeaterItems: []
+	property bool setMask: true
+
+	function petRegion(itemObject) {
+		let newregion = regionComponent.createObject(pets, {
+			"item": itemObject
+		});
+		pets.regions.push(newregion);
+	}
+
+	WlrLayershell.exclusionMode: ExclusionMode.Ignore
+	WlrLayershell.layer: WlrLayer.Overlay
+	WlrLayershell.namespace: "I-DeskPet"
 	color: "transparent"
+	surfaceFormat.opaque: false
+
+	mask: Region {
+		height: Screen.height
+		intersection: Intersection.Xor
+		regions: maskVariants.instances
+		width: Screen.width
+	}
+
 	anchors {
 		bottom: true
 		left: true
+		right: true
+		top: true
 	}
-    surfaceFormat.opaque: false
+
-    implicitWidth: 320 
-    implicitHeight: 293
 	margins {
+		bottom: 0
 		left: 0
-        bottom: 5
+		right: 0
+		top: 0
 	}
 
-    property bool onTop: true
+	GetGifs {
+		id: getGifs
 
-    function toggleLayer() {
+		gifFolder: ConfigLoader.gifFolder
-        if (onTop) {
+	}
-            WlrLayershell.layer = WlrLayer.Bottom
+
-            onTop = false
+	GifsLoader {
+		id: gifLoader
+
+		gifsModel: getGifs.gifsModel
+
+		onItemAdded: function (index, item) {
+			mainWindow.repeaterItems = Array.from({
+				length: gifLoader.count
+			}, (_, i) => gifLoader.itemAt(i)).filter(v => v !== null);
+		}
+		onItemRemoved: function (index, item) {
+			mainWindow.repeaterItems = Array.from({
+				length: gifLoader.count
+			}, (_, i) => gifLoader.itemAt(i)).filter(v => v !== null);
+		}
+	}
+
+	Variants {
+		id: maskVariants
+
+		model: [...mainWindow.repeaterItems]
+
+		Region {
+			required property Item modelData
+
+			height: modelData.height
+			intersection: Intersection.Subtract
+			width: modelData.width
+			x: modelData.x
+			y: modelData.y
+
+			Component.onCompleted: {
+				console.log(modelData);
+			}
+		}
+	}
+
+	Component {
+		id: regionComponent
+
+		Region {
+		}
+	}
+
+	GlobalShortcut {
+		appid: "I-DeskPet"
+		name: "toggle-Layer"
+
+		onPressed: {
+			if (!mainWindow.onTop) {
+				mainWindow.WlrLayershell.layer = WlrLayer.Overlay;
+				mainWindow.onTop = true;
 			} else {
-            WlrLayershell.layer = WlrLayer.Top
+				mainWindow.WlrLayershell.layer = WlrLayer.Bottom;
-            onTop = true
+				mainWindow.onTop = false;
+			}
 		}
 	}
 
-    Rectangle {
+	GlobalShortcut {
-        anchors.fill: parent
+		appid: "I-DeskPet"
-        color: "transparent"
+		name: "toggle-Region"
 
-        id: petContainer
+		onPressed: {
-        AnimatedImage {
+			if (!mainWindow.setMask) {
-            anchors.fill: parent
+				mainWindow.mask = mainWindow.petMove;
-            source: "Gifs/evernight.gif"
+				mainWindow.setMask = true;
-            fillMode: Image.PreserveAspectFit
+			} else {
+				mainWindow.mask = mainWindow.noMove;
+				mainWindow.setMask = false;
+			}
+		}
 	}
 
-        MouseArea {
+	GlobalShortcut {
-            anchors.fill: parent
+		appid: "I-DeskPet"
-            acceptedButtons: Qt.MiddleButton
+		name: "cycle-zIndex"
-            onClicked: (mouse) => {
+
-                if (mouse.button === Qt.MiddleButton) {
+		onPressed: {
-                    mainWindow.toggleLayer()
+			let items = mainWindow.repeaterItems;
+			if (items.length < 2)
+				return;
+
+			// Find the hovered GIF
+			let hovered = null;
+			for (let i = 0; i < items.length; i++) {
+				if (items[i].hovered) {
+					hovered = items[i];
+					break;
 				}
 			}
+			if (!hovered)
+				return;
+			let currentZ = hovered.zIndex;
+			let maxZ = items.length - 1;
+
+			if (currentZ >= maxZ) {
+				// Already on top, wrap to bottom: shift everyone else up by 1
+				for (let i = 0; i < items.length; i++) {
+					if (items[i] !== hovered) {
+						items[i].zIndex += 1;
+					}
+				}
+				hovered.zIndex = 0;
+			} else {
+				// Swap with the item directly above
+				for (let i = 0; i < items.length; i++) {
+					if (items[i] !== hovered && items[i].zIndex === currentZ + 1) {
+						items[i].zIndex = currentZ;
+						break;
+					}
+				}
+				hovered.zIndex = currentZ + 1;
+			}
 		}
 	}
 }