mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-15 18:43:59 +00:00
Revert "Merge pull request #471 from dwuggh/auto-hide-bar"
This reverts commit0e18194094, reversing changes made to8ff7086321.
This commit is contained in:
ItsLemmy
@@ -17,81 +17,6 @@ Variants {
|
||||
id: root
|
||||
|
||||
required property ShellScreen modelData
|
||||
property real scaling: ScalingService.getScreenScale(modelData)
|
||||
|
||||
// Auto-hide state and timings
|
||||
property bool autoHide: Settings.data.bar.autoHide
|
||||
property bool hidden: autoHide
|
||||
property bool barHovered: false
|
||||
property bool peekHovered: false
|
||||
// Keep bar visible while any panel or popup from the bar is open (global)
|
||||
readonly property bool holdOpen: PanelService.hasOpenedPopup || (PanelService.openedPanel && ((PanelService.openedPanel.visible === true) || (PanelService.openedPanel.active === true)))
|
||||
// Controls PanelWindow visibility while auto-hide is enabled
|
||||
property bool barWindowVisible: !autoHide
|
||||
// Respect global animation toggle: no delays when animations are disabled
|
||||
readonly property int hideDelay: Settings.data.general.animationDisabled ? 0 : 500
|
||||
readonly property int showDelay: Settings.data.general.animationDisabled ? 0 : 120
|
||||
readonly property int hideAnimationDuration: Style.animationNormal
|
||||
readonly property int showAnimationDuration: Style.animationNormal
|
||||
|
||||
// Ensure internal state updates when the setting toggles
|
||||
Connections {
|
||||
target: Settings.data.bar
|
||||
function onAutoHideChanged() {
|
||||
root.autoHide = Settings.data.bar.autoHide
|
||||
if (root.autoHide) {
|
||||
root.hidden = true
|
||||
root.barWindowVisible = false
|
||||
} else {
|
||||
root.hidden = false
|
||||
root.barWindowVisible = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Timers for reveal/hide
|
||||
Timer {
|
||||
id: showTimer
|
||||
interval: root.showDelay
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: hideTimer
|
||||
interval: root.hideDelay
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (root.autoHide && !root.peekHovered && !root.barHovered && !root.holdOpen) {
|
||||
root.hidden = true
|
||||
unloadTimer.restart()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// After hide animation, make the window invisible so it doesn't intercept input
|
||||
Timer {
|
||||
id: unloadTimer
|
||||
interval: root.hideAnimationDuration
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (root.autoHide && !root.peekHovered && !root.barHovered && !root.holdOpen) {
|
||||
root.barWindowVisible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: ScalingService
|
||||
function onScaleChanged(screenName, scale) {
|
||||
if ((modelData !== null) && (screenName === modelData.name)) {
|
||||
scaling = scale
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
active: BarService.isVisible && modelData && modelData.name ? (Settings.data.bar.monitors.includes(modelData.name) || (Settings.data.bar.monitors.length === 0)) : false
|
||||
|
||||
@@ -100,11 +25,6 @@ Variants {
|
||||
|
||||
WlrLayershell.namespace: "noctalia-bar"
|
||||
|
||||
WlrLayershell.exclusionMode: root.autoHide ? ExclusionMode.Ignore : ExclusionMode.Auto
|
||||
|
||||
// When auto-hide is enabled, actually toggle window visibility after animations
|
||||
visible: root.autoHide ? root.barWindowVisible : true
|
||||
|
||||
implicitHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? screen.height : Style.barHeight
|
||||
implicitWidth: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? Style.barHeight : screen.width
|
||||
color: Color.transparent
|
||||
@@ -131,79 +51,10 @@ Variants {
|
||||
}
|
||||
}
|
||||
|
||||
// Wrapper for animations when hiding/showing
|
||||
Item {
|
||||
id: barContainer
|
||||
anchors.fill: parent
|
||||
clip: true
|
||||
|
||||
opacity: root.hidden ? 0.0 : 1.0
|
||||
|
||||
// Slide distance depends on bar orientation
|
||||
readonly property real offX: (function () {
|
||||
switch (Settings.data.bar.position) {
|
||||
case "left":
|
||||
return -barContainer.width
|
||||
case "right":
|
||||
return barContainer.width
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
})()
|
||||
readonly property real offY: (function () {
|
||||
switch (Settings.data.bar.position) {
|
||||
case "top":
|
||||
return -barContainer.height
|
||||
case "bottom":
|
||||
return barContainer.height
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
})()
|
||||
|
||||
transform: Translate {
|
||||
id: slide
|
||||
x: root.hidden ? barContainer.offX : 0
|
||||
y: root.hidden ? barContainer.offY : 0
|
||||
Behavior on x {
|
||||
NumberAnimation {
|
||||
duration: root.hidden ? root.hideAnimationDuration : root.showAnimationDuration
|
||||
easing.type: Easing.InOutCubic
|
||||
}
|
||||
}
|
||||
Behavior on y {
|
||||
NumberAnimation {
|
||||
duration: root.hidden ? root.hideAnimationDuration : root.showAnimationDuration
|
||||
easing.type: Easing.InOutCubic
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
duration: root.hidden ? root.hideAnimationDuration : root.showAnimationDuration
|
||||
easing.type: Easing.InOutQuad
|
||||
}
|
||||
}
|
||||
|
||||
// Mark bar hovered without stealing events from child widgets
|
||||
HoverHandler {
|
||||
id: barHoverHandler
|
||||
onHoveredChanged: {
|
||||
root.barHovered = hovered
|
||||
if (!root.autoHide)
|
||||
return
|
||||
if (hovered) {
|
||||
showTimer.stop()
|
||||
hideTimer.stop()
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
} else if (!root.peekHovered && !root.holdOpen) {
|
||||
hideTimer.restart()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Background fill with shadow
|
||||
Rectangle {
|
||||
id: bar
|
||||
@@ -393,113 +244,5 @@ Variants {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Peek window to reveal the bar when hovering at the screen edge
|
||||
Loader {
|
||||
id: peekLoader
|
||||
active: root.modelData && root.autoHide
|
||||
|
||||
sourceComponent: PanelWindow {
|
||||
id: peekWindow
|
||||
screen: root.modelData || null
|
||||
color: Color.transparent
|
||||
focusable: false
|
||||
|
||||
WlrLayershell.namespace: "noctalia-bar-peek"
|
||||
// Do not reserve space; keep as pure overlay so work area never changes
|
||||
WlrLayershell.layer: WlrLayer.Overlay
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
WlrLayershell.keyboardFocus: WlrKeyboardFocus.None
|
||||
|
||||
anchors {
|
||||
top: Settings.data.bar.position === "top"
|
||||
bottom: Settings.data.bar.position === "bottom"
|
||||
left: Settings.data.bar.position === "left"
|
||||
right: Settings.data.bar.position === "right"
|
||||
}
|
||||
|
||||
// 1px reveal strip along the relevant edge
|
||||
implicitHeight: (Settings.data.bar.position === "left" || Settings.data.bar.position === "right") ? screen.height : 1
|
||||
implicitWidth: (Settings.data.bar.position === "top" || Settings.data.bar.position === "bottom") ? screen.width : 1
|
||||
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onEntered: {
|
||||
root.peekHovered = true
|
||||
if (root.autoHide && root.hidden) {
|
||||
showTimer.restart()
|
||||
}
|
||||
}
|
||||
onExited: {
|
||||
root.peekHovered = false
|
||||
if (root.autoHide && !root.barHovered && !root.holdOpen) {
|
||||
hideTimer.restart()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// React to panel/popup lifecycle to keep the bar visible during interactions
|
||||
Connections {
|
||||
target: PanelService
|
||||
// Any panel about to open -> show bar and cancel hides
|
||||
function onWillOpen() {
|
||||
if (!root.autoHide)
|
||||
return
|
||||
showTimer.stop()
|
||||
hideTimer.stop()
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
}
|
||||
// Popups opening/closing -> start/stop hide timer appropriately
|
||||
function onPopupChanged() {
|
||||
if (!root.autoHide)
|
||||
return
|
||||
if (PanelService.hasOpenedPopup) {
|
||||
showTimer.stop()
|
||||
hideTimer.stop()
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
} else if (!root.barHovered && !root.peekHovered && !root.holdOpen) {
|
||||
hideTimer.restart()
|
||||
}
|
||||
}
|
||||
// Track when the main panel closes (openedPanel becomes null)
|
||||
function onOpenedPanelChanged() {
|
||||
if (!root.autoHide)
|
||||
return
|
||||
if (PanelService.openedPanel !== null) {
|
||||
showTimer.stop()
|
||||
hideTimer.stop()
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
} else if (!root.barHovered && !root.peekHovered && !PanelService.hasOpenedPopup) {
|
||||
hideTimer.restart()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Also listen to the current panel's own visible/active changes
|
||||
Connections {
|
||||
target: PanelService.openedPanel
|
||||
enabled: root.autoHide
|
||||
function onVisibleChanged() {
|
||||
if (!PanelService.openedPanel)
|
||||
return
|
||||
if ((PanelService.openedPanel.visible === true) || (PanelService.openedPanel.active === true)) {
|
||||
showTimer.stop()
|
||||
hideTimer.stop()
|
||||
root.barWindowVisible = true
|
||||
root.hidden = false
|
||||
} else if (!root.barHovered && !root.peekHovered && !PanelService.hasOpenedPopup) {
|
||||
hideTimer.restart()
|
||||
}
|
||||
}
|
||||
function onActiveChanged() {
|
||||
onVisibleChanged()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user