1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-29 07:52:50 -05:00

do not put topbar on overlay layer

This commit is contained in:
bbedward
2025-09-21 23:05:55 -04:00
parent c21896b0df
commit de532fdeda

View File

@@ -19,7 +19,6 @@ PanelWindow {
id: root id: root
WlrLayershell.namespace: "quickshell:bar" WlrLayershell.namespace: "quickshell:bar"
WlrLayershell.layer: WlrLayershell.Overlay
property var modelData property var modelData
property var notepadVariants: null property var notepadVariants: null
@@ -150,28 +149,10 @@ PanelWindow {
property real backgroundTransparency: SettingsData.topBarTransparency property real backgroundTransparency: SettingsData.topBarTransparency
property bool autoHide: SettingsData.topBarAutoHide property bool autoHide: SettingsData.topBarAutoHide
property bool isFullscreenWindow: {
const activeWindow = ToplevelManager.activeToplevel
if (!activeWindow || !root.screen) return false
if (activeWindow.fullscreen !== undefined) {
return activeWindow.fullscreen
}
const screenGeometry = root.screen.geometry
if (!screenGeometry || !activeWindow.geometry) return false
return activeWindow.geometry.width >= screenGeometry.width &&
activeWindow.geometry.height >= screenGeometry.height
}
property bool reveal: { property bool reveal: {
if (CompositorService.isNiri && NiriService.inOverview) { if (CompositorService.isNiri && NiriService.inOverview) {
return SettingsData.topBarOpenOnOverview return SettingsData.topBarOpenOnOverview
} }
if (isFullscreenWindow) {
return topBarMouseArea.containsMouse || hasActivePopout
}
return SettingsData.topBarVisible && (!autoHide || topBarMouseArea.containsMouse || hasActivePopout) return SettingsData.topBarVisible && (!autoHide || topBarMouseArea.containsMouse || hasActivePopout)
} }
@@ -207,7 +188,7 @@ PanelWindow {
"loader": systemUpdateLoader, "loader": systemUpdateLoader,
"prop": "shouldBeVisible" "prop": "shouldBeVisible"
}] }]
return loaders.some(item => { return notepadInstanceVisible || loaders.some(item => {
if (item.loader) { if (item.loader) {
return item.loader?.item?.[item.prop] return item.loader?.item?.[item.prop]
} }