mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-05-14 16:22:46 -04:00
refactor(FrameMode): Update modal background opts w/Connected Mode
This commit is contained in:
@@ -249,6 +249,8 @@ Singleton {
|
|||||||
onFrameModeChanged: saveSettings()
|
onFrameModeChanged: saveSettings()
|
||||||
property var connectedFrameBarStyleBackups: ({})
|
property var connectedFrameBarStyleBackups: ({})
|
||||||
onConnectedFrameBarStyleBackupsChanged: saveSettings()
|
onConnectedFrameBarStyleBackupsChanged: saveSettings()
|
||||||
|
property var connectedFrameModalDarkenBackup: null
|
||||||
|
onConnectedFrameModalDarkenBackupChanged: saveSettings()
|
||||||
readonly property bool connectedFrameModeActive: frameEnabled && frameMode === "connected"
|
readonly property bool connectedFrameModeActive: frameEnabled && frameMode === "connected"
|
||||||
onConnectedFrameModeActiveChanged: {
|
onConnectedFrameModeActiveChanged: {
|
||||||
if (_loading)
|
if (_loading)
|
||||||
@@ -1602,12 +1604,15 @@ Singleton {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Single entry point for connected-mode bar-style state.
|
// Single entry point for connected-mode settings state.
|
||||||
// active → capture backups (if not yet) and sanitize bar configs
|
|
||||||
// !active → restore backups
|
// !active → restore backups
|
||||||
function _reconcileConnectedFrameBarStyles() {
|
function _reconcileConnectedFrameBarStyles() {
|
||||||
if (!connectedFrameModeActive) {
|
if (!connectedFrameModeActive) {
|
||||||
_restoreConnectedFrameBarStyleBackups();
|
_restoreConnectedFrameBarStyleBackups();
|
||||||
|
if (connectedFrameModalDarkenBackup === true) {
|
||||||
|
connectedFrameModalDarkenBackup = null;
|
||||||
|
set("modalDarkenBackground", true);
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!_hasConnectedFrameBarStyleBackups())
|
if (!_hasConnectedFrameBarStyleBackups())
|
||||||
@@ -1617,6 +1622,11 @@ Singleton {
|
|||||||
barConfigs = result.configs;
|
barConfigs = result.configs;
|
||||||
updateBarConfigs();
|
updateBarConfigs();
|
||||||
}
|
}
|
||||||
|
// Force modalDarkenBackground off; capture backup if not already set
|
||||||
|
if (modalDarkenBackground) {
|
||||||
|
connectedFrameModalDarkenBackup = true;
|
||||||
|
set("modalDarkenBackground", false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function detectAvailableIconThemes() {
|
function detectAvailableIconThemes() {
|
||||||
|
|||||||
@@ -446,6 +446,7 @@ var SPEC = {
|
|||||||
displayShowDisconnected: { def: false },
|
displayShowDisconnected: { def: false },
|
||||||
displaySnapToEdge: { def: true },
|
displaySnapToEdge: { def: true },
|
||||||
connectedFrameBarStyleBackups: { def: {} },
|
connectedFrameBarStyleBackups: { def: {} },
|
||||||
|
connectedFrameModalDarkenBackup: { def: null },
|
||||||
|
|
||||||
barConfigs: {
|
barConfigs: {
|
||||||
def: [{
|
def: [{
|
||||||
|
|||||||
@@ -635,17 +635,8 @@ Item {
|
|||||||
id: backgroundDarken
|
id: backgroundDarken
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: "black"
|
color: "black"
|
||||||
opacity: launcherMotionVisible && SettingsData.modalDarkenBackground ? 0.5 : 0
|
opacity: 0
|
||||||
visible: launcherMotionVisible || opacity > 0
|
visible: false
|
||||||
|
|
||||||
Behavior on opacity {
|
|
||||||
enabled: root.animationsEnabled && (!Theme.isDirectionalEffect || Theme.isConnectedEffect)
|
|
||||||
NumberAnimation {
|
|
||||||
easing.type: Easing.BezierSpline
|
|
||||||
duration: Math.round(Theme.variantDuration(root.launcherAnimationDuration, launcherMotionVisible) * Theme.variantOpacityDurationScale)
|
|
||||||
easing.bezierCurve: launcherMotionVisible ? root.launcherEnterCurve : root.launcherExitCurve
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|||||||
Reference in New Issue
Block a user