Skip to content

Commit 6d1c2e8

Browse files
18202781743deepin-bot[bot]
authored andcommitted
fix: incorrect margin in treeland for notification
Adjust UI for notification Using exclusionZone to Adatp incorrect margin in treeland. Drop DWindow's platformhandle. pms: TASK-366403
1 parent b94a3ce commit 6d1c2e8

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

panels/notification/bubble/package/main.qml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ Window {
3838
DLayerShellWindow.topMargin: windowMargin(0)
3939
DLayerShellWindow.rightMargin: windowMargin(1)
4040
DLayerShellWindow.bottomMargin: windowMargin(2)
41+
DLayerShellWindow.exclusionZone: -1
4142
palette: DTK.palette
4243
ColorSelector.family: Palette.CrystalColor
43-
DWindow.windowEffect: PlatformHandle.EffectNoBorder | PlatformHandle.EffectNoShadow
44+
// DWindow.windowEffect: PlatformHandle.EffectNoBorder | PlatformHandle.EffectNoShadow
4445
color: "transparent"
45-
DWindow.windowRadius: 0
46-
DWindow.enabled: false
46+
// DWindow.windowRadius: 0
47+
// DWindow.enabled: false
4748
// DWindow.enableBlurWindow: true
4849
screen: Qt.application.screens[0]
4950
// TODO `Qt.application.screens[0]` maybe invalid, why screen is changed.

panels/notification/center/package/main.qml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,18 @@ Window {
3737
// height: 800
3838
DLayerShellWindow.layer: DLayerShellWindow.LayerOverlay
3939
DLayerShellWindow.anchors: DLayerShellWindow.AnchorRight | DLayerShellWindow.AnchorTop | DLayerShellWindow.AnchorBottom
40-
DLayerShellWindow.topMargin: windowMargin(0) + 10
41-
DLayerShellWindow.rightMargin: windowMargin(1) + 10
42-
DLayerShellWindow.bottomMargin: windowMargin(2) + 10
40+
DLayerShellWindow.topMargin: windowMargin(0)
41+
DLayerShellWindow.rightMargin: windowMargin(1)
42+
DLayerShellWindow.bottomMargin: windowMargin(2)
43+
DLayerShellWindow.exclusionZone: -1
4344
palette: DTK.palette
4445
ColorSelector.family: Palette.CrystalColor
45-
DWindow.windowEffect: PlatformHandle.EffectNoBorder | PlatformHandle.EffectNoShadow
46+
// DWindow.windowEffect: PlatformHandle.EffectNoBorder | PlatformHandle.EffectNoShadow
4647
// DWindow.windowRadius: DTK.platformTheme.windowRadius
4748
// DWindow.enableSystemResize: false
4849
// DWindow.enableSystemMove: false
49-
DWindow.windowRadius: 0
50-
DWindow.enabled: false
50+
// DWindow.windowRadius: 0
51+
// DWindow.enabled: false
5152
color: "transparent"
5253
// DWindow.enableBlurWindow: true
5354
screen: Qt.application.screens[0]
@@ -83,6 +84,7 @@ Window {
8384
top: parent.top
8485
left: parent.left
8586
margins: 10
87+
rightMargin: 20
8688
bottom: parent.bottom
8789
}
8890

0 commit comments

Comments
 (0)