mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
Fix panel interactive flag and reserved height
NavigationPanel: the taskStrip ListView checked contentWidth > width to decide whether scrolling is enabled, which is wrong when the panel is vertical. Check contentHeight > height in that case. taskpanel: dockSpaceReserver used a hardcoded gridUnit * 3 for both height and exclusionZone. Use navigationPanelHeight so the reserved strip tracks the actual panel thickness.
This commit is contained in:
parent
9b94c200ee
commit
667efec483
2 changed files with 3 additions and 3 deletions
|
|
@ -148,7 +148,7 @@ Item {
|
||||||
orientation: root.isVertical ? ListView.Vertical : ListView.Horizontal
|
orientation: root.isVertical ? ListView.Vertical : ListView.Horizontal
|
||||||
spacing: Kirigami.Units.smallSpacing
|
spacing: Kirigami.Units.smallSpacing
|
||||||
clip: true
|
clip: true
|
||||||
interactive: contentWidth > width
|
interactive: root.isVertical ? contentHeight > height : contentWidth > width
|
||||||
model: root.taskModel
|
model: root.taskModel
|
||||||
|
|
||||||
delegate: NavigationPanelButton {
|
delegate: NavigationPanelButton {
|
||||||
|
|
|
||||||
|
|
@ -158,13 +158,13 @@ ContainmentItem {
|
||||||
color: "transparent"
|
color: "transparent"
|
||||||
flags: Qt.FramelessWindowHint | Qt.WindowTransparentForInput
|
flags: Qt.FramelessWindowHint | Qt.WindowTransparentForInput
|
||||||
// height is set by layer-shell anchoring; provide a fallback.
|
// height is set by layer-shell anchoring; provide a fallback.
|
||||||
height: Kirigami.Units.gridUnit * 3
|
height: root.navigationPanelHeight
|
||||||
width: 1 // layer-shell stretches it via AnchorLeft|AnchorRight
|
width: 1 // layer-shell stretches it via AnchorLeft|AnchorRight
|
||||||
|
|
||||||
LayerShell.Window.scope: "dock-space"
|
LayerShell.Window.scope: "dock-space"
|
||||||
LayerShell.Window.layer: LayerShell.Window.LayerBottom
|
LayerShell.Window.layer: LayerShell.Window.LayerBottom
|
||||||
LayerShell.Window.anchors: LayerShell.Window.AnchorBottom | LayerShell.Window.AnchorLeft | LayerShell.Window.AnchorRight
|
LayerShell.Window.anchors: LayerShell.Window.AnchorBottom | LayerShell.Window.AnchorLeft | LayerShell.Window.AnchorRight
|
||||||
LayerShell.Window.exclusionZone: Kirigami.Units.gridUnit * 3
|
LayerShell.Window.exclusionZone: root.navigationPanelHeight
|
||||||
LayerShell.Window.keyboardInteractivity: LayerShell.Window.KeyboardInteractivityNone
|
LayerShell.Window.keyboardInteractivity: LayerShell.Window.KeyboardInteractivityNone
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue