mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-05-13 07:42:46 -04:00
fix(Notepad): Blur handling on the header layer to remain in sync
- Fixes #2372
This commit is contained in:
@@ -962,7 +962,6 @@ Item {
|
|||||||
slideoutWidth: 480
|
slideoutWidth: 480
|
||||||
expandable: true
|
expandable: true
|
||||||
expandedWidthValue: 960
|
expandedWidthValue: 960
|
||||||
customTransparency: SettingsData.notepadTransparencyOverride
|
|
||||||
|
|
||||||
content: Component {
|
content: Component {
|
||||||
Notepad {
|
Notepad {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ PanelWindow {
|
|||||||
|
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
|
|
||||||
readonly property bool slideoutBlurActive: root.visible && BlurService.enabled
|
readonly property bool slideoutBlurActive: root.visible && BlurService.enabled && Theme.connectedSurfaceBlurEnabled
|
||||||
|
|
||||||
WlrLayershell.layer: WlrLayershell.Top
|
WlrLayershell.layer: WlrLayershell.Top
|
||||||
WlrLayershell.exclusiveZone: 0
|
WlrLayershell.exclusiveZone: 0
|
||||||
@@ -125,7 +125,7 @@ PanelWindow {
|
|||||||
layer.textureSize: Qt.size(width * root.dpr, height * root.dpr)
|
layer.textureSize: Qt.size(width * root.dpr, height * root.dpr)
|
||||||
opacity: 1
|
opacity: 1
|
||||||
|
|
||||||
readonly property real effectiveTransparency: root.customTransparency >= 0 ? root.customTransparency : SettingsData.popupTransparency
|
readonly property color slideoutSurfaceColor: root.customTransparency >= 0 ? Theme.withAlpha(Theme.surfaceContainer, root.customTransparency) : Theme.popupLayerColor(Theme.surfaceContainer)
|
||||||
|
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
@@ -134,10 +134,10 @@ PanelWindow {
|
|||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: Theme.transparentBlurLayers ? "transparent" : Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, contentRect.effectiveTransparency)
|
color: contentRect.slideoutSurfaceColor
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.connectedSurfaceRadius
|
||||||
border.color: BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium
|
border.color: Theme.isConnectedEffect ? "transparent" : (BlurService.enabled ? BlurService.borderColor : Theme.outlineMedium)
|
||||||
border.width: BlurService.borderWidth
|
border.width: Theme.isConnectedEffect ? 0 : BlurService.borderWidth
|
||||||
}
|
}
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
@@ -222,6 +222,6 @@ PanelWindow {
|
|||||||
blurY: root.slideoutBlurActive ? slideContainer.y : 0
|
blurY: root.slideoutBlurActive ? slideContainer.y : 0
|
||||||
blurWidth: root.slideoutBlurActive ? slideContainer.width : 0
|
blurWidth: root.slideoutBlurActive ? slideContainer.width : 0
|
||||||
blurHeight: root.slideoutBlurActive ? slideContainer.height : 0
|
blurHeight: root.slideoutBlurActive ? slideContainer.height : 0
|
||||||
blurRadius: Theme.cornerRadius
|
blurRadius: Theme.connectedSurfaceRadius
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user