mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
multi-bar: removed all globals bar properties
This commit is contained in:
@@ -18,6 +18,10 @@ Variants {
|
||||
|
||||
required property ShellScreen modelData
|
||||
|
||||
// Per-monitor bar configuration
|
||||
property var barConfig: Settings.getMonitorBarConfig(modelData.name)
|
||||
readonly property real barHeight: BarService.getBarHeight(barConfig.density, barConfig.position)
|
||||
|
||||
// Access the notification model from the service
|
||||
property ListModel notificationModel: NotificationService.activeList
|
||||
|
||||
@@ -70,9 +74,9 @@ Variants {
|
||||
if (!(anchors.top))
|
||||
return 0
|
||||
var base = Style.marginM
|
||||
if (Settings.data.bar.position === "top") {
|
||||
var floatExtraV = Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL : 0
|
||||
return (Style.barHeight) + base + floatExtraV
|
||||
if (root.barConfig.position === "top") {
|
||||
var floatExtraV = root.barConfig.floating ? root.barConfig.marginVertical * Style.marginXL : 0
|
||||
return (barHeight) + base + floatExtraV
|
||||
}
|
||||
return base
|
||||
}
|
||||
@@ -81,9 +85,9 @@ Variants {
|
||||
if (!(anchors.bottom))
|
||||
return 0
|
||||
var base = Style.marginM
|
||||
if (Settings.data.bar.position === "bottom") {
|
||||
var floatExtraV = Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL : 0
|
||||
return (Style.barHeight) + base + floatExtraV
|
||||
if (root.barConfig.position === "bottom") {
|
||||
var floatExtraV = root.barConfig.floating ? root.barConfig.marginVertical * Style.marginXL : 0
|
||||
return (barHeight) + base + floatExtraV
|
||||
}
|
||||
return base
|
||||
}
|
||||
@@ -92,9 +96,9 @@ Variants {
|
||||
if (!(anchors.left))
|
||||
return 0
|
||||
var base = Style.marginM
|
||||
if (Settings.data.bar.position === "left") {
|
||||
var floatExtraH = Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL : 0
|
||||
return (Style.barHeight) + base + floatExtraH
|
||||
if (root.barConfig.position === "left") {
|
||||
var floatExtraH = root.barConfig.floating ? root.barConfig.marginHorizontal * Style.marginXL : 0
|
||||
return (barHeight) + base + floatExtraH
|
||||
}
|
||||
return base
|
||||
}
|
||||
@@ -103,9 +107,9 @@ Variants {
|
||||
if (!(anchors.right))
|
||||
return 0
|
||||
var base = Style.marginM
|
||||
if (Settings.data.bar.position === "right") {
|
||||
var floatExtraH = Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL : 0
|
||||
return (Style.barHeight) + base + floatExtraH
|
||||
if (root.barConfig.position === "right") {
|
||||
var floatExtraH = root.barConfig.floating ? root.barConfig.marginHorizontal * Style.marginXL : 0
|
||||
return (barHeight) + base + floatExtraH
|
||||
}
|
||||
return base
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user