mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
spotlight: remove darken bg opt, improve performance
This commit is contained in:
@@ -876,21 +876,6 @@ Item {
|
||||
}
|
||||
}
|
||||
|
||||
SettingsCard {
|
||||
tab: "theme"
|
||||
tags: ["modal", "darken", "background", "overlay"]
|
||||
|
||||
SettingsToggleRow {
|
||||
tab: "theme"
|
||||
tags: ["modal", "darken", "background", "overlay"]
|
||||
settingKey: "modalDarkenBackground"
|
||||
text: I18n.tr("Darken Modal Background")
|
||||
description: I18n.tr("Show darkened overlay behind modal dialogs")
|
||||
checked: SettingsData.modalDarkenBackground
|
||||
onToggled: checked => SettingsData.set("modalDarkenBackground", checked)
|
||||
}
|
||||
}
|
||||
|
||||
SettingsCard {
|
||||
tab: "theme"
|
||||
tags: ["applications", "portal", "dark", "terminal"]
|
||||
|
||||
@@ -13,7 +13,8 @@ Scope {
|
||||
property string searchActiveScreen: ""
|
||||
property bool isClosing: false
|
||||
property bool releaseKeyboard: false
|
||||
property bool overlayActive: (NiriService.inOverview && !(PopoutService.spotlightModal?.spotlightOpen ?? false)) || searchActive
|
||||
readonly property bool spotlightModalOpen: PopoutService.spotlightModal?.spotlightOpen ?? false
|
||||
property bool overlayActive: (NiriService.inOverview && !spotlightModalOpen) || searchActive
|
||||
|
||||
function showSpotlight(screenName) {
|
||||
isClosing = false;
|
||||
@@ -33,7 +34,7 @@ Scope {
|
||||
hideSpotlight();
|
||||
}
|
||||
|
||||
function completeHide() {
|
||||
function resetState() {
|
||||
searchActive = false;
|
||||
searchActiveScreen = "";
|
||||
isClosing = false;
|
||||
@@ -43,19 +44,15 @@ Scope {
|
||||
Connections {
|
||||
target: NiriService
|
||||
function onInOverviewChanged() {
|
||||
if (!NiriService.inOverview) {
|
||||
if (searchActive) {
|
||||
isClosing = true;
|
||||
return;
|
||||
}
|
||||
searchActive = false;
|
||||
searchActiveScreen = "";
|
||||
isClosing = false;
|
||||
if (NiriService.inOverview) {
|
||||
resetState();
|
||||
return;
|
||||
}
|
||||
searchActive = false;
|
||||
searchActiveScreen = "";
|
||||
isClosing = false;
|
||||
if (!searchActive) {
|
||||
resetState();
|
||||
return;
|
||||
}
|
||||
isClosing = true;
|
||||
}
|
||||
|
||||
function onCurrentOutputChanged() {
|
||||
@@ -65,13 +62,9 @@ Scope {
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: PopoutService.spotlightModal
|
||||
function onSpotlightOpenChanged() {
|
||||
if (!PopoutService.spotlightModal?.spotlightOpen || !searchActive)
|
||||
return;
|
||||
onSpotlightModalOpenChanged: {
|
||||
if (spotlightModalOpen && searchActive)
|
||||
hideSpotlight();
|
||||
}
|
||||
}
|
||||
|
||||
Loader {
|
||||
@@ -221,6 +214,7 @@ Scope {
|
||||
layer.textureSize: Qt.size(Math.round(width * overlayWindow.dpr), Math.round(height * overlayWindow.dpr))
|
||||
|
||||
Behavior on scale {
|
||||
id: scaleAnimation
|
||||
NumberAnimation {
|
||||
duration: Theme.expressiveDurations.expressiveDefaultSpatial
|
||||
easing.type: Easing.BezierSpline
|
||||
@@ -228,11 +222,17 @@ Scope {
|
||||
onRunningChanged: {
|
||||
if (running || !spotlightContainer.animatingOut)
|
||||
return;
|
||||
niriOverviewScope.completeHide();
|
||||
niriOverviewScope.resetState();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onAnimatingOutChanged: {
|
||||
if (!animatingOut || scaleAnimation.animation.running)
|
||||
return;
|
||||
Qt.callLater(niriOverviewScope.resetState);
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
duration: Theme.expressiveDurations.expressiveDefaultSpatial
|
||||
|
||||
Reference in New Issue
Block a user