left-bar working, bottom bar semi-broken
This commit is contained in:
+13
-8
@@ -7,17 +7,18 @@ import qs.Modules.Bar as Bar
|
||||
Region {
|
||||
id: root
|
||||
|
||||
required property Bar.BarLoader bar
|
||||
// required property Bar.BarLoader bar
|
||||
readonly property real borderThickness: win.borderThickness
|
||||
required property EdgeGeometry geometry
|
||||
readonly property alias menuPopoutRegion: menuPopoutRegion
|
||||
required property Panels panels
|
||||
required property var win
|
||||
|
||||
height: win.height - bar.implicitHeight - win.borderThickness - win.dragMaskPadding * 2
|
||||
height: win.height - geometry.insetTop(borderThickness, true) - geometry.insetBottom(borderThickness, true) - win.dragMaskPadding * 2
|
||||
intersection: Intersection.Xor
|
||||
width: win.width - win.borderThickness * 2 - win.dragMaskPadding * 2
|
||||
x: win.borderThickness + win.dragMaskPadding
|
||||
y: bar.implicitHeight + win.dragMaskPadding
|
||||
width: win.width - geometry.insetLeft(borderThickness, true) * 2 - win.dragMaskPadding * 2
|
||||
x: geometry.insetLeft(borderThickness, true) + win.dragMaskPadding
|
||||
y: geometry.insetTop(borderThickness, true) + win.dragMaskPadding
|
||||
|
||||
R {
|
||||
panel: root.panels.dashboardWrapper
|
||||
@@ -41,17 +42,21 @@ Region {
|
||||
}
|
||||
|
||||
R {
|
||||
height: panel.height + root.geometry.insetTop(root.borderThickness)
|
||||
panel: root.panels.notifications
|
||||
y: 0
|
||||
}
|
||||
|
||||
R {
|
||||
height: panel.height * (1 - root.panels.utilities.offsetScale) + root.borderThickness
|
||||
height: panel.height * (1 - root.panels.utilities.offsetScale) + root.geometry.insetBottom(root.borderThickness)
|
||||
panel: root.panels.utilities
|
||||
y: root.win.height - height
|
||||
}
|
||||
|
||||
R {
|
||||
height: root.geometry.horizontal ? panel.height * (1 - root.panels.popoutsWrapper.offsetScale) : panel.height
|
||||
panel: root.panels.popoutsWrapper
|
||||
width: root.geometry.horizontal ? panel.width : panel.width * (1 - root.panels.popoutsWrapper.offsetScale)
|
||||
}
|
||||
|
||||
R {
|
||||
@@ -82,7 +87,7 @@ Region {
|
||||
height: panel.height
|
||||
intersection: Intersection.Subtract
|
||||
width: panel.width
|
||||
x: panel.x + root.borderThickness
|
||||
y: panel.y + root.bar.implicitHeight
|
||||
x: panel.x + root.geometry.insetLeft(root.borderThickness)
|
||||
y: panel.y + root.geometry.insetTop(root.borderThickness)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user