mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Dock: fix non exclusive mode
This commit is contained in:
@@ -386,11 +386,11 @@ Loader {
|
||||
anchors.left: dockPosition === "left"
|
||||
anchors.right: dockPosition === "right"
|
||||
|
||||
// Offset past bar when at same edge (only if dock is non-exclusive and bar is floating)
|
||||
margins.top: dockPosition === "top" ? (!exclusive && barAtSameEdge && Settings.data.bar.floating ? Style.barHeight + Settings.data.bar.marginVertical + floatingMargin : floatingMargin) : 0
|
||||
margins.bottom: dockPosition === "bottom" ? (!exclusive && barAtSameEdge && Settings.data.bar.floating ? Style.barHeight + Settings.data.bar.marginVertical + floatingMargin : floatingMargin) : 0
|
||||
margins.left: dockPosition === "left" ? (!exclusive && barAtSameEdge && Settings.data.bar.floating ? Style.barHeight + Settings.data.bar.marginHorizontal + floatingMargin : floatingMargin) : 0
|
||||
margins.right: dockPosition === "right" ? (!exclusive && barAtSameEdge && Settings.data.bar.floating ? Style.barHeight + Settings.data.bar.marginHorizontal + floatingMargin : floatingMargin) : 0
|
||||
// Offset past bar when at same edge (skip bar offset if dock is exclusive - exclusion zones stack)
|
||||
margins.top: dockPosition === "top" ? (barAtSameEdge && !exclusive ? Style.barHeight + (Settings.data.bar.floating ? Settings.data.bar.marginVertical : 0) + floatingMargin : floatingMargin) : 0
|
||||
margins.bottom: dockPosition === "bottom" ? (barAtSameEdge && !exclusive ? Style.barHeight + (Settings.data.bar.floating ? Settings.data.bar.marginVertical : 0) + floatingMargin : floatingMargin) : 0
|
||||
margins.left: dockPosition === "left" ? (barAtSameEdge && !exclusive ? Style.barHeight + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal : 0) + floatingMargin : floatingMargin) : 0
|
||||
margins.right: dockPosition === "right" ? (barAtSameEdge && !exclusive ? Style.barHeight + (Settings.data.bar.floating ? Settings.data.bar.marginHorizontal : 0) + floatingMargin : floatingMargin) : 0
|
||||
|
||||
// Container wrapper for animations
|
||||
Item {
|
||||
|
||||
Reference in New Issue
Block a user