Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-10 05:03:28 -04:00
Code Packages Releases Activity

refactor(frame): improve connected mode surface recovery

Browse Source 
- share modal and launcher ownership handling
- recover missing background and blur layers
This commit is contained in:
purian23
2026-06-07 17:47:24 -04:00
parent 69f3dee25a
commit d08c7c5e55
9 changed files with 439 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modals/Common/DankModalConnected.qml
+28 -46
View File
@@ -105,21 +105,26 @@ Item {
property bool animationsEnabled: true
property string _chromeClaimId: ""
property bool _fullSyncPending: false
function _nextChromeClaimId() {
return layerNamespace + ":modal:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
}
function _currentScreenName() {
return effectiveScreen ? effectiveScreen.name : "";
}
function _publishModalChromeState(isClaim) {
const screenName = _currentScreenName();
if (!screenName)
return;
ConnectedModalChrome {
id: modalChrome
modalHandle: root.modalHandle
claimPrefix: root.layerNamespace + ":modal"
screenName: root._currentScreenName()
enabled: root.frameOwnsConnectedChrome
active: root.shouldBeVisible
presented: root.shouldBeVisible || contentWindow.visible
dockBlocked: root._dockBlocksEmergence
dockSide: root.resolvedConnectedBarSide
onRecoveryRequested: root._queueFullSync()
}
function _publishModalChromeState() {
const state = {
"visible": shouldBeVisible || contentWindow.visible,
"barSide": resolvedConnectedBarSide,
@@ -132,25 +137,11 @@ Item {
"omitStartConnector": false,
"omitEndConnector": false
};
if (isClaim)
ConnectedModeState.claimModalState(screenName, state, _chromeClaimId);
else
ConnectedModeState.updateModalState(screenName, state, _chromeClaimId);
return modalChrome.publish(state);
}
function _syncModalChromeState() {
if (!frameOwnsConnectedChrome) {
_releaseModalChrome();
return;
}
const isClaim = !_chromeClaimId;
if (!_chromeClaimId)
_chromeClaimId = _nextChromeClaimId();
_publishModalChromeState(isClaim);
if (_dockBlocksEmergence && (shouldBeVisible || contentWindow.visible))
ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
else
ConnectedModeState.releaseDockRetract(_chromeClaimId);
_publishModalChromeState();
}
property bool _animSyncQueued: false
@@ -187,32 +178,21 @@ Item {
}
function _syncModalAnim() {
if (!frameOwnsConnectedChrome || !_chromeClaimId)
if (!frameOwnsConnectedChrome)
return;
const screenName = _currentScreenName();
if (!screenName || !modalContainer)
if (!modalContainer)
return;
ConnectedModeState.setModalAnim(screenName, modalContainer.animX, modalContainer.animY, _chromeClaimId);
modalChrome.updateAnim(modalContainer.animX, modalContainer.animY);
}
function _syncModalBody() {
if (!frameOwnsConnectedChrome || !_chromeClaimId)
if (!frameOwnsConnectedChrome)
return;
const screenName = _currentScreenName();
if (!screenName)
return;
ConnectedModeState.setModalBody(screenName, alignedX, alignedY, alignedWidth, alignedHeight, _chromeClaimId);
modalChrome.updateBody(alignedX, alignedY, alignedWidth, alignedHeight);
}
function _releaseModalChrome() {
if (!_chromeClaimId)
return;
ConnectedModeState.releaseDockRetract(_chromeClaimId);
const claimId = _chromeClaimId;
_chromeClaimId = "";
const screenName = _currentScreenName();
if (screenName)
ConnectedModeState.clearModalState(screenName, claimId);
modalChrome.release();
}
onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
@@ -223,8 +203,6 @@ Item {
onAlignedWidthChanged: _queueBodySync()
onAlignedHeightChanged: _queueBodySync()
Component.onDestruction: _releaseModalChrome()
Connections {
target: contentWindow
function onVisibleChanged() {
@@ -248,12 +226,12 @@ Item {
clickCatcher.screen = focusedScreen;
}
ModalManager.openModal(modalHandle);
if (Theme.isDirectionalEffect || root.useBackground) {
if (!useSingleWindow)
clickCatcher.visible = true;
contentWindow.visible = true;
}
ModalManager.openModal(modalHandle);
Qt.callLater(() => {
animationsEnabled = true;
@@ -317,8 +295,12 @@ Item {
break;
}
}
if (screenStillExists)
if (screenStillExists) {
if (root.shouldBeVisible)
root._queueFullSync();
return;
}
root._releaseModalChrome();
const newScreen = CompositorService.getFocusedScreen();
if (newScreen) {
contentWindow.screen = newScreen;
quickshell/Modals/DankLauncherV2/DankLauncherV2ModalConnected.qml
+27 -45
View File
@@ -232,21 +232,26 @@ Item {
onTriggered: root._flushSync()
}
property string _chromeClaimId: ""
property bool _fullSyncPending: false
function _nextChromeClaimId() {
return "dms:launcher-v2:" + (new Date()).getTime() + ":" + Math.floor(Math.random() * 1000);
}
function _currentScreenName() {
return effectiveScreen ? effectiveScreen.name : "";
}
function _publishModalChromeState(isClaim) {
const screenName = _currentScreenName();
if (!screenName)
return;
ConnectedModalChrome {
id: modalChrome
modalHandle: root.modalHandle
claimPrefix: "dms:launcher-v2"
screenName: root._currentScreenName()
enabled: root.frameOwnsConnectedChrome
active: root.spotlightOpen
presented: root.spotlightOpen || contentWindow.visible
dockBlocked: root._dockBlocksEmergence
dockSide: root.resolvedConnectedBarSide
onRecoveryRequested: root._queueFullSync()
}
function _publishModalChromeState() {
const state = {
"visible": spotlightOpen || contentWindow.visible,
"barSide": resolvedConnectedBarSide,
@@ -259,25 +264,11 @@ Item {
"omitStartConnector": false,
"omitEndConnector": false
};
if (isClaim)
ConnectedModeState.claimModalState(screenName, state, _chromeClaimId);
else
ConnectedModeState.updateModalState(screenName, state, _chromeClaimId);
return modalChrome.publish(state);
}
function _syncModalChromeState() {
if (!frameOwnsConnectedChrome) {
_releaseModalChrome();
return;
}
const isClaim = !_chromeClaimId;
if (!_chromeClaimId)
_chromeClaimId = _nextChromeClaimId();
_publishModalChromeState(isClaim);
if (_dockBlocksEmergence && (spotlightOpen || contentWindow.visible))
ConnectedModeState.requestDockRetract(_chromeClaimId, _currentScreenName(), resolvedConnectedBarSide);
else
ConnectedModeState.releaseDockRetract(_chromeClaimId);
_publishModalChromeState();
}
property bool _animSyncQueued: false
@@ -314,32 +305,21 @@ Item {
}
function _syncModalAnim() {
if (!frameOwnsConnectedChrome || !_chromeClaimId)
if (!frameOwnsConnectedChrome)
return;
const screenName = _currentScreenName();
if (!screenName || !contentContainer)
if (!contentContainer)
return;
ConnectedModeState.setModalAnim(screenName, contentContainer.animX, contentContainer.animY, _chromeClaimId);
modalChrome.updateAnim(contentContainer.animX, contentContainer.animY);
}
function _syncModalBody() {
if (!frameOwnsConnectedChrome || !_chromeClaimId)
if (!frameOwnsConnectedChrome)
return;
const screenName = _currentScreenName();
if (!screenName)
return;
ConnectedModeState.setModalBody(screenName, _connectedChromeX, _connectedChromeY, _connectedChromeWidth, _connectedChromeHeight, _chromeClaimId);
modalChrome.updateBody(_connectedChromeX, _connectedChromeY, _connectedChromeWidth, _connectedChromeHeight);
}
function _releaseModalChrome() {
if (!_chromeClaimId)
return;
ConnectedModeState.releaseDockRetract(_chromeClaimId);
const claimId = _chromeClaimId;
_chromeClaimId = "";
const screenName = _currentScreenName();
if (screenName)
ConnectedModeState.clearModalState(screenName, claimId);
modalChrome.release();
}
onFrameOwnsConnectedChromeChanged: _syncModalChromeState()
@@ -351,8 +331,6 @@ Item {
onAlignedWidthChanged: _queueBodySync()
onAlignedHeightChanged: _queueBodySync()
Component.onDestruction: _releaseModalChrome()
Connections {
target: contentWindow
function onVisibleChanged() {
@@ -579,13 +557,17 @@ Item {
}
}
if (!needsReset)
if (!needsReset) {
if (root.spotlightOpen)
root._queueFullSync();
return;
}
const newScreen = CompositorService.getFocusedScreen() ?? Quickshell.screens[0];
if (!newScreen)
return;
root._releaseModalChrome();
root._windowEnabled = false;
backgroundWindow.screen = newScreen;
contentWindow.screen = newScreen;