diff --git a/quickshell/Common/DankModalWindow.qml b/quickshell/Common/DankModalWindow.qml index 6b309dd3..7487350b 100644 --- a/quickshell/Common/DankModalWindow.qml +++ b/quickshell/Common/DankModalWindow.qml @@ -14,31 +14,8 @@ Singleton { property var activeModal: null property bool windowsVisible: false property var targetScreen: null - property var persistentModal: null - readonly property bool hasActiveModal: activeModal !== null - readonly property bool hasPersistentModal: persistentModal !== null - readonly property bool isPersistentModalActive: hasActiveModal && activeModal === persistentModal readonly property bool shouldShowModal: hasActiveModal - readonly property bool shouldKeepWindowsAlive: hasPersistentModal - - onPersistentModalChanged: { - if (!persistentModal) - return; - cachedModal = persistentModal; - cachedModalWidth = Theme.px(persistentModal.modalWidth, dpr); - cachedModalHeight = Theme.px(persistentModal.modalHeight, dpr); - cachedModalX = calculateX(persistentModal); - cachedModalY = calculateY(persistentModal); - cachedAnimationDuration = persistentModal.animationDuration ?? Theme.shortDuration; - cachedEnterCurve = persistentModal.animationEnterCurve ?? Theme.expressiveCurves.expressiveFastSpatial; - cachedExitCurve = persistentModal.animationExitCurve ?? Theme.expressiveCurves.expressiveFastSpatial; - cachedScaleCollapsed = persistentModal.animationScaleCollapsed ?? 0.96; - if (persistentModal.directContent) { - persistentModal.directContent.parent = directContentWrapper; - persistentModal.directContent.anchors.fill = directContentWrapper; - } - } readonly property var screen: backgroundWindow.screen readonly property real dpr: screen ? CompositorService.getScreenScale(screen) : 1 readonly property real shadowBuffer: 5 @@ -184,7 +161,7 @@ Singleton { PanelWindow { id: backgroundWindow - visible: root.windowsVisible || root.shouldKeepWindowsAlive + visible: root.windowsVisible screen: root.targetScreen color: "transparent" @@ -246,7 +223,7 @@ Singleton { PanelWindow { id: contentWindow - visible: root.windowsVisible || root.shouldKeepWindowsAlive + visible: root.windowsVisible screen: root.targetScreen color: "transparent" diff --git a/quickshell/Modals/Spotlight/SpotlightModal.qml b/quickshell/Modals/Spotlight/SpotlightModal.qml index e0137134..7d16c4ae 100644 --- a/quickshell/Modals/Spotlight/SpotlightModal.qml +++ b/quickshell/Modals/Spotlight/SpotlightModal.qml @@ -130,10 +130,6 @@ DankModal { target: "spotlight" } - Component.onCompleted: { - DankModalWindow.persistentModal = spotlightModal; - } - SpotlightContent { id: spotlightContentInstance