mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-08-08 23:37:49 +00:00
Panels: splitted bg and content for improved perfs.
This commit is contained in:
ItsLemmy
@@ -0,0 +1,514 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Wayland
|
||||
import qs.Commons
|
||||
import qs.Services.Compositor
|
||||
import qs.Services.UI
|
||||
|
||||
|
||||
/**
|
||||
* SmartPanelWindow - Separate window for panel content
|
||||
*
|
||||
* This component runs in its own window, separate from MainScreen.
|
||||
* It follows the PanelPlaceholder for positioning and contains the actual panel content.
|
||||
*/
|
||||
PanelWindow {
|
||||
id: root
|
||||
|
||||
// Required reference to placeholder
|
||||
required property PanelPlaceholder placeholder
|
||||
|
||||
// Panel content component (set by SmartPanel wrapper)
|
||||
property Component panelContent: null
|
||||
|
||||
// Reference to the SmartPanel wrapper (for keyboard handlers)
|
||||
property var panelWrapper: null
|
||||
|
||||
// Color properties (forwarded from SmartPanel)
|
||||
property color panelBackgroundColor: Color.mSurface
|
||||
property color panelBorderColor: Color.mOutline
|
||||
|
||||
// Track whether panel is open
|
||||
property bool isPanelOpen: false
|
||||
|
||||
// Track actual visibility (delayed until content is loaded and sized)
|
||||
property bool isPanelVisible: false
|
||||
|
||||
// Track size animation completion for sequential opacity animation
|
||||
property bool sizeAnimationComplete: false
|
||||
|
||||
// Track close animation state
|
||||
property bool isClosing: false
|
||||
property bool opacityFadeComplete: false
|
||||
property bool closeFinalized: false
|
||||
|
||||
// Safety: Watchdog timers
|
||||
property bool closeWatchdogActive: false
|
||||
property bool openWatchdogActive: false
|
||||
|
||||
// Signals
|
||||
signal panelOpened
|
||||
signal panelClosed
|
||||
|
||||
// Keyboard event handlers (forwarded from SmartPanel wrapper)
|
||||
function handleEscapePressed() {
|
||||
close()
|
||||
}
|
||||
function handleTabPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onTabPressed) {
|
||||
contentLoader.item.onTabPressed()
|
||||
}
|
||||
}
|
||||
function handleShiftTabPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onShiftTabPressed) {
|
||||
contentLoader.item.onShiftTabPressed()
|
||||
}
|
||||
}
|
||||
function handleUpPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onUpPressed) {
|
||||
contentLoader.item.onUpPressed()
|
||||
}
|
||||
}
|
||||
function handleDownPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onDownPressed) {
|
||||
contentLoader.item.onDownPressed()
|
||||
}
|
||||
}
|
||||
function handleLeftPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onLeftPressed) {
|
||||
contentLoader.item.onLeftPressed()
|
||||
}
|
||||
}
|
||||
function handleRightPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onRightPressed) {
|
||||
contentLoader.item.onRightPressed()
|
||||
}
|
||||
}
|
||||
function handleReturnPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onReturnPressed) {
|
||||
contentLoader.item.onReturnPressed()
|
||||
}
|
||||
}
|
||||
function handleHomePressed() {
|
||||
if (contentLoader.item && contentLoader.item.onHomePressed) {
|
||||
contentLoader.item.onHomePressed()
|
||||
}
|
||||
}
|
||||
function handleEndPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onEndPressed) {
|
||||
contentLoader.item.onEndPressed()
|
||||
}
|
||||
}
|
||||
function handlePageUpPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onPageUpPressed) {
|
||||
contentLoader.item.onPageUpPressed()
|
||||
}
|
||||
}
|
||||
function handlePageDownPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onPageDownPressed) {
|
||||
contentLoader.item.onPageDownPressed()
|
||||
}
|
||||
}
|
||||
function handleCtrlJPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onCtrlJPressed) {
|
||||
contentLoader.item.onCtrlJPressed()
|
||||
}
|
||||
}
|
||||
function handleCtrlKPressed() {
|
||||
if (contentLoader.item && contentLoader.item.onCtrlKPressed) {
|
||||
contentLoader.item.onCtrlKPressed()
|
||||
}
|
||||
}
|
||||
|
||||
// Window configuration
|
||||
color: "transparent"
|
||||
mask: null // No mask - content window is rectangular
|
||||
visible: isPanelOpen
|
||||
|
||||
// Wayland layer shell configuration - fullscreen window
|
||||
WlrLayershell.layer: WlrLayer.Top
|
||||
WlrLayershell.namespace: "noctalia-panel-content-" + placeholder.panelName + "-" + (placeholder.screen?.name || "unknown")
|
||||
WlrLayershell.exclusionMode: ExclusionMode.Ignore
|
||||
|
||||
// Different compositor handle the keyboard focus differently (inc. mouse)
|
||||
// This ensures all keyboard shortcuts work reliably (Escape, etc.)
|
||||
// Also ensures that the launcher get proper focus on launch.
|
||||
WlrLayershell.keyboardFocus: {
|
||||
if (CompositorService.isNiri) {
|
||||
return root.isPanelOpen ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
|
||||
} else {
|
||||
return root.isPanelOpen ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
|
||||
}
|
||||
}
|
||||
|
||||
// Anchor to all edges to make fullscreen
|
||||
anchors {
|
||||
top: true
|
||||
bottom: true
|
||||
left: true
|
||||
right: true
|
||||
}
|
||||
|
||||
// Sync state to placeholder
|
||||
onIsPanelVisibleChanged: {
|
||||
placeholder.isPanelVisible = isPanelVisible
|
||||
}
|
||||
onIsClosingChanged: {
|
||||
placeholder.isClosing = isClosing
|
||||
}
|
||||
onOpacityFadeCompleteChanged: {
|
||||
placeholder.opacityFadeComplete = opacityFadeComplete
|
||||
}
|
||||
|
||||
// Panel control functions
|
||||
function toggle(buttonItem, buttonName) {
|
||||
if (!isPanelOpen) {
|
||||
open(buttonItem, buttonName)
|
||||
} else {
|
||||
close()
|
||||
}
|
||||
}
|
||||
|
||||
function open(buttonItem, buttonName) {
|
||||
if (!buttonItem && buttonName) {
|
||||
buttonItem = BarService.lookupWidget(buttonName, placeholder.screen.name)
|
||||
}
|
||||
|
||||
if (buttonItem) {
|
||||
placeholder.buttonItem = buttonItem
|
||||
// Map button position to screen coordinates
|
||||
var buttonPos = buttonItem.mapToItem(null, 0, 0)
|
||||
placeholder.buttonPosition = Qt.point(buttonPos.x, buttonPos.y)
|
||||
placeholder.buttonWidth = buttonItem.width
|
||||
placeholder.buttonHeight = buttonItem.height
|
||||
placeholder.useButtonPosition = true
|
||||
} else {
|
||||
// No button provided: reset button position mode
|
||||
placeholder.buttonItem = null
|
||||
placeholder.useButtonPosition = false
|
||||
}
|
||||
|
||||
// Set isPanelOpen to trigger content loading
|
||||
isPanelOpen = true
|
||||
|
||||
// Notify PanelService
|
||||
PanelService.willOpenPanel(root)
|
||||
}
|
||||
|
||||
function close() {
|
||||
// Start close sequence: fade opacity first
|
||||
isClosing = true
|
||||
sizeAnimationComplete = false
|
||||
closeFinalized = false
|
||||
|
||||
// Stop the open animation timer if it's still running
|
||||
opacityTrigger.stop()
|
||||
openWatchdogActive = false
|
||||
openWatchdogTimer.stop()
|
||||
|
||||
// Start close watchdog timer
|
||||
closeWatchdogActive = true
|
||||
closeWatchdogTimer.restart()
|
||||
|
||||
// If opacity is already 0, skip directly to size animation
|
||||
if (contentWrapper.opacity === 0.0) {
|
||||
opacityFadeComplete = true
|
||||
} else {
|
||||
opacityFadeComplete = false
|
||||
}
|
||||
|
||||
Logger.d("SmartPanelWindow", "Closing panel", placeholder.panelName)
|
||||
}
|
||||
|
||||
function finalizeClose() {
|
||||
// Prevent double-finalization
|
||||
if (root.closeFinalized) {
|
||||
Logger.w("SmartPanelWindow", "finalizeClose called but already finalized - ignoring", placeholder.panelName)
|
||||
return
|
||||
}
|
||||
|
||||
// Complete the close sequence after animations finish
|
||||
root.closeFinalized = true
|
||||
root.closeWatchdogActive = false
|
||||
closeWatchdogTimer.stop()
|
||||
|
||||
root.isPanelVisible = false
|
||||
root.isPanelOpen = false
|
||||
root.isClosing = false
|
||||
root.opacityFadeComplete = false
|
||||
PanelService.closedPanel(root)
|
||||
panelClosed()
|
||||
|
||||
Logger.d("SmartPanelWindow", "Panel close finalized", placeholder.panelName)
|
||||
}
|
||||
|
||||
// Fullscreen container for click-to-close and content
|
||||
Item {
|
||||
anchors.fill: parent
|
||||
focus: true // Enable keyboard event handling
|
||||
|
||||
// Handle keyboard events directly via Keys handler
|
||||
Keys.onPressed: event => {
|
||||
Logger.d("SmartPanelWindow", "Key pressed:", event.key, "for panel:", placeholder.panelName)
|
||||
|
||||
if (event.key === Qt.Key_Escape) {
|
||||
Logger.d("SmartPanelWindow", "Escape - closing panel")
|
||||
root.close()
|
||||
event.accepted = true
|
||||
} else if (panelWrapper) {
|
||||
// Forward to panelWrapper's onXXXPressed methods (defined in SmartPanel/Launcher)
|
||||
if (event.key === Qt.Key_Up && panelWrapper.onUpPressed) {
|
||||
Logger.d("SmartPanelWindow", "Up - forwarding to panelWrapper")
|
||||
panelWrapper.onUpPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_Down && panelWrapper.onDownPressed) {
|
||||
Logger.d("SmartPanelWindow", "Down - forwarding to panelWrapper")
|
||||
panelWrapper.onDownPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_Left && panelWrapper.onLeftPressed) {
|
||||
panelWrapper.onLeftPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_Right && panelWrapper.onRightPressed) {
|
||||
panelWrapper.onRightPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_Tab) {
|
||||
if (event.modifiers & Qt.ShiftModifier && panelWrapper.onShiftTabPressed) {
|
||||
panelWrapper.onShiftTabPressed()
|
||||
} else if (panelWrapper.onTabPressed) {
|
||||
panelWrapper.onTabPressed()
|
||||
}
|
||||
event.accepted = true
|
||||
} else if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && panelWrapper.onReturnPressed) {
|
||||
panelWrapper.onReturnPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_Home && panelWrapper.onHomePressed) {
|
||||
panelWrapper.onHomePressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_End && panelWrapper.onEndPressed) {
|
||||
panelWrapper.onEndPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_PageUp && panelWrapper.onPageUpPressed) {
|
||||
panelWrapper.onPageUpPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_PageDown && panelWrapper.onPageDownPressed) {
|
||||
panelWrapper.onPageDownPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_J && (event.modifiers & Qt.ControlModifier) && panelWrapper.onCtrlJPressed) {
|
||||
panelWrapper.onCtrlJPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_K && (event.modifiers & Qt.ControlModifier) && panelWrapper.onCtrlKPressed) {
|
||||
panelWrapper.onCtrlKPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_N && (event.modifiers & Qt.ControlModifier) && panelWrapper.onCtrlNPressed) {
|
||||
panelWrapper.onCtrlNPressed()
|
||||
event.accepted = true
|
||||
} else if (event.key === Qt.Key_P && (event.modifiers & Qt.ControlModifier) && panelWrapper.onCtrlPPressed) {
|
||||
panelWrapper.onCtrlPPressed()
|
||||
event.accepted = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Background MouseArea for click-to-close (behind content)
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
enabled: root.isPanelOpen && !root.isClosing
|
||||
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
|
||||
onClicked: mouse => {
|
||||
root.close()
|
||||
mouse.accepted = true
|
||||
}
|
||||
z: 0
|
||||
}
|
||||
|
||||
// Content wrapper with opacity animation
|
||||
Item {
|
||||
id: contentWrapper
|
||||
// Position at placeholder location within fullscreen window
|
||||
x: placeholder.panelItem.x
|
||||
y: placeholder.panelItem.y
|
||||
width: placeholder.panelItem.width
|
||||
height: placeholder.panelItem.height
|
||||
z: 1 // Above click-to-close MouseArea
|
||||
|
||||
// Opacity animation
|
||||
opacity: {
|
||||
if (isClosing)
|
||||
return 0.0
|
||||
if (isPanelVisible && sizeAnimationComplete)
|
||||
return 1.0
|
||||
return 0.0
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
id: opacityAnimation
|
||||
duration: root.isClosing ? Style.animationFaster : Style.animationFast
|
||||
easing.type: Easing.OutQuad
|
||||
|
||||
onRunningChanged: {
|
||||
// Safety: Zero-duration animation handling
|
||||
if (!running && duration === 0) {
|
||||
if (root.isClosing && contentWrapper.opacity === 0.0) {
|
||||
root.opacityFadeComplete = true
|
||||
var shouldFinalizeNow = placeholder.panelItem && !placeholder.panelItem.shouldAnimateWidth && !placeholder.panelItem.shouldAnimateHeight
|
||||
if (shouldFinalizeNow) {
|
||||
Logger.d("SmartPanelWindow", "Zero-duration opacity + no size animation - finalizing", placeholder.panelName)
|
||||
Qt.callLater(root.finalizeClose)
|
||||
}
|
||||
} else if (root.isPanelVisible && contentWrapper.opacity === 1.0) {
|
||||
root.openWatchdogActive = false
|
||||
openWatchdogTimer.stop()
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// When opacity fade completes during close, trigger size animation
|
||||
if (!running && root.isClosing && contentWrapper.opacity === 0.0) {
|
||||
root.opacityFadeComplete = true
|
||||
var shouldFinalizeNow = placeholder.panelItem && !placeholder.panelItem.shouldAnimateWidth && !placeholder.panelItem.shouldAnimateHeight
|
||||
if (shouldFinalizeNow) {
|
||||
Logger.d("SmartPanelWindow", "No animation - finalizing immediately", placeholder.panelName)
|
||||
Qt.callLater(root.finalizeClose)
|
||||
} else {
|
||||
Logger.d("SmartPanelWindow", "Animation will run - waiting for size animation", placeholder.panelName)
|
||||
}
|
||||
} // When opacity fade completes during open, stop watchdog
|
||||
else if (!running && root.isPanelVisible && contentWrapper.opacity === 1.0) {
|
||||
root.openWatchdogActive = false
|
||||
openWatchdogTimer.stop()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Panel content loader
|
||||
Loader {
|
||||
id: contentLoader
|
||||
active: isPanelOpen
|
||||
anchors.fill: parent
|
||||
sourceComponent: root.panelContent
|
||||
|
||||
// When content finishes loading, trigger positioning and visibility
|
||||
onLoaded: {
|
||||
// Capture initial content-driven size if available
|
||||
if (contentLoader.item) {
|
||||
var hasWidthProp = contentLoader.item.hasOwnProperty('contentPreferredWidth')
|
||||
var hasHeightProp = contentLoader.item.hasOwnProperty('contentPreferredHeight')
|
||||
|
||||
if (hasWidthProp || hasHeightProp) {
|
||||
var initialWidth = hasWidthProp ? contentLoader.item.contentPreferredWidth : 0
|
||||
var initialHeight = hasHeightProp ? contentLoader.item.contentPreferredHeight : 0
|
||||
placeholder.updateContentSize(initialWidth, initialHeight)
|
||||
Logger.d("SmartPanelWindow", "Initial content size:", initialWidth, "x", initialHeight, placeholder.panelName)
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate position in placeholder
|
||||
placeholder.setPosition()
|
||||
|
||||
// Make panel visible on the next frame
|
||||
Qt.callLater(function () {
|
||||
root.isPanelVisible = true
|
||||
opacityTrigger.start()
|
||||
|
||||
// Start open watchdog timer
|
||||
root.openWatchdogActive = true
|
||||
openWatchdogTimer.start()
|
||||
|
||||
panelOpened()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// MouseArea to prevent clicks on panel content from closing it
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
|
||||
onClicked: mouse => {
|
||||
mouse.accepted = true // Eat the click to prevent propagation to background
|
||||
}
|
||||
z: -1 // Behind content but above background click-to-close
|
||||
}
|
||||
|
||||
// Watch for changes in content-driven sizes
|
||||
Connections {
|
||||
target: contentLoader.item
|
||||
ignoreUnknownSignals: true
|
||||
|
||||
function onContentPreferredWidthChanged() {
|
||||
if (root.isPanelOpen && root.isPanelVisible && contentLoader.item) {
|
||||
placeholder.updateContentSize(contentLoader.item.contentPreferredWidth, placeholder.contentPreferredHeight)
|
||||
}
|
||||
}
|
||||
|
||||
function onContentPreferredHeightChanged() {
|
||||
if (root.isPanelOpen && root.isPanelVisible && contentLoader.item) {
|
||||
placeholder.updateContentSize(placeholder.contentPreferredWidth, contentLoader.item.contentPreferredHeight)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Timer to trigger opacity fade at 50% of size animation
|
||||
Timer {
|
||||
id: opacityTrigger
|
||||
interval: Style.animationNormal * 0.5
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (root.isPanelVisible) {
|
||||
root.sizeAnimationComplete = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Watchdog timer for open sequence
|
||||
Timer {
|
||||
id: openWatchdogTimer
|
||||
interval: Style.animationNormal * 3
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (root.openWatchdogActive) {
|
||||
Logger.w("SmartPanelWindow", "Open watchdog timeout - forcing panel visible state", placeholder.panelName)
|
||||
root.openWatchdogActive = false
|
||||
if (root.isPanelOpen && !root.isPanelVisible) {
|
||||
root.isPanelVisible = true
|
||||
root.sizeAnimationComplete = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Watchdog timer for close sequence
|
||||
Timer {
|
||||
id: closeWatchdogTimer
|
||||
interval: Style.animationFast * 3
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (root.closeWatchdogActive && !root.closeFinalized) {
|
||||
Logger.w("SmartPanelWindow", "Close watchdog timeout - forcing panel close", placeholder.panelName)
|
||||
Qt.callLater(root.finalizeClose)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Watch for placeholder size animation completion to finalize close
|
||||
Connections {
|
||||
target: placeholder.panelItem
|
||||
|
||||
function onWidthChanged() {
|
||||
// When width shrinks to 0 during close and we're animating width, finalize
|
||||
if (root.isClosing && placeholder.panelItem.width === 0 && placeholder.panelItem.shouldAnimateWidth) {
|
||||
Qt.callLater(root.finalizeClose)
|
||||
}
|
||||
}
|
||||
|
||||
function onHeightChanged() {
|
||||
// When height shrinks to 0 during close and we're animating height, finalize
|
||||
if (root.isClosing && placeholder.panelItem.height === 0 && placeholder.panelItem.shouldAnimateHeight) {
|
||||
Qt.callLater(root.finalizeClose)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user