screenshot: adjust cursor CLI option to be more explicit

core/cmd/dms/commands_screenshot.go

@@ -13,16 +13,16 @@ import (
 )
 
 var (
-	ssOutputName    string
-	ssIncludeCursor bool
-	ssFormat        string
-	ssQuality       int
-	ssOutputDir     string
-	ssFilename      string
-	ssNoClipboard   bool
-	ssNoFile        bool
-	ssNoNotify      bool
-	ssStdout        bool
+	ssOutputName  string
+	ssCursor      string
+	ssFormat      string
+	ssQuality     int
+	ssOutputDir   string
+	ssFilename    string
+	ssNoClipboard bool
+	ssNoFile      bool
+	ssNoNotify    bool
+	ssStdout      bool
 )
 
 var screenshotCmd = &cobra.Command{
@@ -52,7 +52,7 @@ Examples:
   dms screenshot last                # Last region (pre-selected)
   dms screenshot --no-clipboard      # Save file only
   dms screenshot --no-file           # Clipboard only
-  dms screenshot --cursor            # Include cursor
+  dms screenshot --cursor=on         # Include cursor
   dms screenshot -f jpg -q 85        # JPEG with quality 85`,
 }
 
@@ -111,7 +111,7 @@ var notifyActionCmd = &cobra.Command{
 
 func init() {
 	screenshotCmd.PersistentFlags().StringVarP(&ssOutputName, "output", "o", "", "Output name for 'output' mode")
-	screenshotCmd.PersistentFlags().BoolVar(&ssIncludeCursor, "cursor", false, "Include cursor in screenshot")
+	screenshotCmd.PersistentFlags().StringVar(&ssCursor, "cursor", "off", "Include cursor in screenshot (on/off)")
 	screenshotCmd.PersistentFlags().StringVarP(&ssFormat, "format", "f", "png", "Output format (png, jpg, ppm)")
 	screenshotCmd.PersistentFlags().IntVarP(&ssQuality, "quality", "q", 90, "JPEG quality (1-100)")
 	screenshotCmd.PersistentFlags().StringVarP(&ssOutputDir, "dir", "d", "", "Output directory")
@@ -136,7 +136,9 @@ func getScreenshotConfig(mode screenshot.Mode) screenshot.Config {
 	config := screenshot.DefaultConfig()
 	config.Mode = mode
 	config.OutputName = ssOutputName
-	config.IncludeCursor = ssIncludeCursor
+	if strings.EqualFold(ssCursor, "on") {
+		config.Cursor = screenshot.CursorOn
+	}
 	config.Clipboard = !ssNoClipboard
 	config.SaveFile = !ssNoFile
 	config.Notify = !ssNoNotify

core/internal/screenshot/region.go

@@ -108,7 +108,7 @@ func NewRegionSelector(s *Screenshoter) *RegionSelector {
 		screenshoter:       s,
 		outputs:            make(map[uint32]*WaylandOutput),
 		preCapture:         make(map[*WaylandOutput]*PreCapture),
-		showCapturedCursor: true,
+		showCapturedCursor: s.config.Cursor == CursorOn,
 	}
 }
 

core/internal/screenshot/screenshot.go

@@ -453,10 +453,7 @@ func (s *Screenshoter) blitBuffer(dst, src *ShmBuffer, dstX, dstY int, yInverted
 }
 
 func (s *Screenshoter) captureWholeOutput(output *WaylandOutput) (*CaptureResult, error) {
-	cursor := int32(0)
-	if s.config.IncludeCursor {
-		cursor = 1
-	}
+	cursor := int32(s.config.Cursor)
 
 	frame, err := s.screencopy.CaptureOutput(cursor, output.wlOutput)
 	if err != nil {
@@ -624,10 +621,7 @@ func (s *Screenshoter) captureRegionOnOutput(output *WaylandOutput, region Regio
 		}
 	}
 
-	cursor := int32(0)
-	if s.config.IncludeCursor {
-		cursor = 1
-	}
+	cursor := int32(s.config.Cursor)
 
 	frame, err := s.screencopy.CaptureOutputRegion(cursor, output.wlOutput, localX, localY, w, h)
 	if err != nil {

core/internal/screenshot/types.go

@@ -19,6 +19,13 @@ const (
 	FormatPPM
 )
 
+type CursorMode int
+
+const (
+	CursorOff CursorMode = iota
+	CursorOn
+)
+
 type Region struct {
 	X      int32  `json:"x"`
 	Y      int32  `json:"y"`
@@ -42,29 +49,29 @@ type Output struct {
 }
 
 type Config struct {
-	Mode          Mode
-	OutputName    string
-	IncludeCursor bool
-	Format        Format
-	Quality       int
-	OutputDir     string
-	Filename      string
-	Clipboard     bool
-	SaveFile      bool
-	Notify        bool
-	Stdout        bool
+	Mode       Mode
+	OutputName string
+	Cursor     CursorMode
+	Format     Format
+	Quality    int
+	OutputDir  string
+	Filename   string
+	Clipboard  bool
+	SaveFile   bool
+	Notify     bool
+	Stdout     bool
 }
 
 func DefaultConfig() Config {
 	return Config{
-		Mode:          ModeRegion,
-		IncludeCursor: false,
-		Format:        FormatPNG,
-		Quality:       90,
-		OutputDir:     "",
-		Filename:      "",
-		Clipboard:     true,
-		SaveFile:      true,
-		Notify:        true,
+		Mode:      ModeRegion,
+		Cursor:    CursorOff,
+		Format:    FormatPNG,
+		Quality:   90,
+		OutputDir: "",
+		Filename:  "",
+		Clipboard: true,
+		SaveFile:  true,
+		Notify:    true,
 	}
 }

quickshell/Common/SettingsData.qml

@@ -60,6 +60,7 @@ Singleton {
     property bool _hasLoaded: false
     property bool _isReadOnly: false
     property bool _hasUnsavedChanges: false
+    property bool _selfWrite: false
     property var _loadedSettingsSnapshot: null
     property var pluginSettings: ({})
     property var builtInPluginSettings: ({})
@@ -1243,6 +1244,7 @@ Singleton {
     function saveSettings() {
         if (_loading || _parseError || !_hasLoaded)
             return;
+        _selfWrite = true;
         settingsFile.setText(JSON.stringify(Store.toJson(root), null, 2));
         if (_isReadOnly)
             _checkSettingsWritable();
@@ -2589,7 +2591,13 @@ Singleton {
         blockWrites: true
         atomicWrites: true
         watchChanges: true
-        onFileChanged: settingsFileReloadDebounce.restart()
+        onFileChanged: {
+            if (_selfWrite) {
+                _selfWrite = false;
+                return;
+            }
+            settingsFileReloadDebounce.restart();
+        }
         onLoaded: {
             if (isGreeterMode)
                 return;

quickshell/Modules/Notifications/Center/HistoryNotificationList.qml

@@ -278,7 +278,7 @@ Item {
                     Behavior on x {
                         enabled: !swipeDragHandler.active && delegateRoot.__delegateInitialized
                         NumberAnimation {
-                            duration: Theme.shortDuration
+                            duration: Theme.notificationExitDuration
                             easing.type: Theme.standardEasing
                         }
                     }
@@ -286,7 +286,7 @@ Item {
                     Behavior on opacity {
                         enabled: delegateRoot.__delegateInitialized
                         NumberAnimation {
-                            duration: delegateRoot.__delegateInitialized ? Theme.shortDuration : 0
+                            duration: delegateRoot.__delegateInitialized ? Theme.notificationExitDuration : 0
                         }
                     }
                 }

quickshell/Modules/Notifications/Center/KeyboardNavigatedNotificationList.qml

@@ -257,7 +257,7 @@ DankListView {
             target: delegateRoot
             property: "swipeOffset"
             to: 0
-            duration: Theme.shortDuration
+            duration: Theme.notificationExitDuration
             easing.type: Easing.OutCubic
             onStopped: NotificationService.dismissGroup(delegateRoot.modelData?.key || "")
         }

quickshell/Modules/Notifications/Center/NotificationCard.qml

@@ -764,7 +764,7 @@ Rectangle {
                         target: expandedDelegateWrapper
                         property: "swipeOffset"
                         to: expandedDelegateWrapper.swipeOffset > 0 ? expandedDelegateWrapper.width : -expandedDelegateWrapper.width
-                        duration: Theme.shortDuration
+                        duration: Theme.notificationExitDuration
                         easing.type: Easing.OutCubic
                         onStopped: NotificationService.dismissNotification(modelData)
                     }

quickshell/Modules/Notifications/Center/NotificationCenterPopout.qml

@@ -35,9 +35,9 @@ DankPopout {
     popupWidth: triggerScreen ? Math.min(500, Math.max(380, triggerScreen.width - 48)) : 400
     popupHeight: stablePopupHeight
     positioning: ""
-    animationScaleCollapsed: 1.0
+    animationScaleCollapsed: 0.94
     animationOffset: 0
-    suspendShadowWhileResizing: true
+    suspendShadowWhileResizing: false
 
     screen: triggerScreen
     shouldBeVisible: notificationHistoryVisible

quickshell/Modules/Notifications/Popup/NotificationPopup.qml

@@ -814,7 +814,7 @@ PanelWindow {
         Behavior on swipeOffset {
             enabled: !content.swipeActive && !content.swipeDismissing
             NumberAnimation {
-                duration: Theme.shortDuration
+                duration: Theme.notificationExitDuration
                 easing.type: Theme.standardEasing
             }
         }
@@ -824,7 +824,7 @@ PanelWindow {
             target: content
             property: "swipeOffset"
             to: isTopCenter ? -content.height : isBottomCenter ? content.height : (SettingsData.notificationPopupPosition === SettingsData.Position.Left || SettingsData.notificationPopupPosition === SettingsData.Position.Bottom ? -content.width : content.width)
-            duration: Theme.shortDuration
+            duration: Theme.notificationExitDuration
             easing.type: Easing.OutCubic
             onStopped: {
                 NotificationService.dismissNotification(notificationData);

quickshell/Modules/Settings/ThemeColorsTab.qml

@@ -16,7 +16,7 @@ Item {
     property var cachedCursorThemes: SettingsData.availableCursorThemes
     property var cachedMatugenSchemes: Theme.availableMatugenSchemes.map(option => option.label)
     property var installedRegistryThemes: []
-    property var templateDetection: ({})
+    property var templateDetection: []
 
     property var cursorIncludeStatus: ({
             "exists": false,
@@ -106,9 +106,10 @@ Item {
     }
 
     function isTemplateDetected(templateId) {
-        if (!templateDetection || Object.keys(templateDetection).length === 0)
+        if (!templateDetection || templateDetection.length === 0)
             return true;
-        return templateDetection[templateId] !== false;
+        var item = templateDetection.find(i => i.id === templateId);
+        return !item || item.detected !== false;
     }
 
     function getTemplateDescription(templateId, baseDescription) {
@@ -145,30 +146,17 @@ Item {
             DMSService.listInstalledThemes();
         if (PopoutService.pendingThemeInstall)
             Qt.callLater(() => showThemeBrowser());
-        templateCheckProcess.running = true;
+        Proc.runCommand("template-check", ["dms", "matugen", "check"], (output, exitCode) => {
+            if (exitCode !== 0)
+                return;
+            try {
+                themeColorsTab.templateDetection = JSON.parse(output.trim());
+            } catch (e) {}
+        });
         if (CompositorService.isNiri || CompositorService.isHyprland || CompositorService.isDwl)
             checkCursorIncludeStatus();
     }
 
-    Process {
-        id: templateCheckProcess
-        command: ["dms", "matugen", "check"]
-        running: false
-
-        stdout: StdioCollector {
-            onStreamFinished: {
-                try {
-                    const results = JSON.parse(text);
-                    const detection = {};
-                    for (const item of results) {
-                        detection[item.id] = item.detected;
-                    }
-                    themeColorsTab.templateDetection = detection;
-                } catch (e) {}
-            }
-        }
-    }
-
     Connections {
         target: DMSService
         function onInstalledThemesReceived(themes) {