Make things more readable
This commit is contained in:
parent
1157c8e21d
commit
1ee14df915
4 changed files with 70 additions and 13 deletions
|
|
@ -47,10 +47,10 @@ Variants {
|
||||||
|
|
||||||
// Floating bar margins - only apply when floating is enabled
|
// Floating bar margins - only apply when floating is enabled
|
||||||
margins {
|
margins {
|
||||||
top: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling: 0
|
top: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
|
||||||
bottom: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
|
bottom: Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0
|
||||||
left: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling: 0
|
left: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
|
||||||
right: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling: 0
|
right: Settings.data.bar.floating ? Settings.data.bar.marginHorizontal * Style.marginXL * scaling : 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
|
|
|
||||||
|
|
@ -167,8 +167,14 @@ Variants {
|
||||||
// Position above the bar if it's at bottom
|
// Position above the bar if it's at bottom
|
||||||
anchors.bottom: true
|
anchors.bottom: true
|
||||||
|
|
||||||
// TODO fixme
|
margins.bottom: {
|
||||||
margins.bottom: barAtBottom ? barHeight + floatingMargin : floatingMargin
|
switch (Settings.data.bar.position) {
|
||||||
|
case "bottom":
|
||||||
|
return (Style.barHeight + Style.marginM) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
|
||||||
|
default:
|
||||||
|
return floatingMargin
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Rectangle {
|
// Rectangle {
|
||||||
// anchors.fill: parent
|
// anchors.fill: parent
|
||||||
|
|
|
||||||
|
|
@ -44,13 +44,43 @@ Variants {
|
||||||
implicitHeight: Math.round(toast.visible ? toast.height + Style.marginM * scaling : 1)
|
implicitHeight: Math.round(toast.visible ? toast.height + Style.marginM * scaling : 1)
|
||||||
|
|
||||||
// Set margins based on bar position
|
// Set margins based on bar position
|
||||||
margins.top: Settings.data.bar.position === "top" ? (Style.barHeight + Style.marginS + (Settings.data.bar.floating ? Settings.data.bar.marginVertical : 0)) : 0
|
margins.top: {
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "top":
|
||||||
|
return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
margins.bottom: Settings.data.bar.position === "bottom" ? (Style.barHeight + Style.marginS + (Settings.data.bar.floating ? Settings.data.bar.marginVertical : 0)) : 0
|
margins.bottom: {
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "bottom":
|
||||||
|
return (Style.barHeight + Style.marginS) * scaling + (Settings.data.bar.floating ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
margins.right: (Settings.data.bar.position === "left" || Settings.data.bar.position === "top" || Settings.data.bar.position === "bottom") ? Style.marginM * scaling : 0
|
margins.right: {
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "left":
|
||||||
|
case "top":
|
||||||
|
case "bottom":
|
||||||
|
return Style.marginM * scaling
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
margins.left: Settings.data.bar.position === "right" ? Style.marginM * scaling : 0
|
margins.left: {
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "right":
|
||||||
|
return Style.marginM * scaling
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Transparent background
|
// Transparent background
|
||||||
color: Color.transparent
|
color: Color.transparent
|
||||||
|
|
@ -67,8 +97,8 @@ Variants {
|
||||||
// Simple positioning - margins already account for bar
|
// Simple positioning - margins already account for bar
|
||||||
targetY: Style.marginS * scaling
|
targetY: Style.marginS * scaling
|
||||||
|
|
||||||
// Hidden position based on bar location
|
// Hidden position - always start from above the screen
|
||||||
hiddenY: Settings.data.bar.position === "top" ? -toast.height - 20 : toast.height + 20
|
hiddenY: -toast.height - 20
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
// Register this toast with the service
|
// Register this toast with the service
|
||||||
|
|
|
||||||
|
|
@ -186,8 +186,29 @@ Loader {
|
||||||
anchors.left: true
|
anchors.left: true
|
||||||
anchors.right: true
|
anchors.right: true
|
||||||
anchors.bottom: true
|
anchors.bottom: true
|
||||||
margins.top: (barIsVisible && !barAtBottom) ? (barHeight + ((Settings.data.bar.floating && !panelAnchorVerticalCenter) ? Settings.data.bar.marginVertical : 0)) : 0
|
margins.top: {
|
||||||
margins.bottom: (barIsVisible && barAtBottom) ? (barHeight + ((Settings.data.bar.floating && !panelAnchorVerticalCenter) ? Settings.data.bar.marginVertical : 0)) : 0
|
if (!barIsVisible || barAtBottom) {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "top":
|
||||||
|
return (Style.barHeight + Style.marginM) * scaling + (Settings.data.bar.floating && !panelAnchorVerticalCenter ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
|
||||||
|
default:
|
||||||
|
return Style.marginM * scaling
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
margins.bottom: {
|
||||||
|
if (!barIsVisible || !barAtBottom) {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
switch (Settings.data.bar.position) {
|
||||||
|
case "bottom":
|
||||||
|
return (Style.barHeight + Style.marginM) * scaling + (Settings.data.bar.floating && !panelAnchorVerticalCenter ? Settings.data.bar.marginVertical * Style.marginXL * scaling : 0)
|
||||||
|
default:
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Close any panel with Esc without requiring focus
|
// Close any panel with Esc without requiring focus
|
||||||
Shortcut {
|
Shortcut {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue