never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TrayMenu: changed gap to overlap, so we can reach the submenu properly

Browse source
This commit is contained in:
quadbyte 2025-08-18 21:21:26 -04:00
parent f769443372
commit ed188ebfda
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/Bar/TrayMenu.qml
View file

@ -15,7 +15,9 @@ PopupWindow {
property bool isSubMenu: false property bool isSubMenu: false
property bool isHovered: rootMouseArea.containsMouse property bool isHovered: rootMouseArea.containsMouse
implicitWidth: 180 * scaling readonly property int menuWidth: 180
implicitWidth: menuWidth * scaling
// Use the content height of the Flickable for implicit height // Use the content height of the Flickable for implicit height
implicitHeight: Math.min(Screen.height * 0.9, flickable.contentHeight + (Style.marginM * 2 * scaling)) implicitHeight: Math.min(Screen.height * 0.9, flickable.contentHeight + (Style.marginM * 2 * scaling))
@ -44,7 +46,7 @@ PopupWindow {
visible = true visible = true
forceActiveFocus() forceActiveFocus()
// Force update after showing. This should now be more reliable. // Force update after showing.
Qt.callLater(() => { Qt.callLater(() => {
root.anchor.updateAnchor() root.anchor.updateAnchor()
}) })
@ -204,11 +206,16 @@ PopupWindow {
entry.subMenu.destroy() entry.subMenu.destroy()
} }
// Need a slight overlap so that menu don't close when moving the mouse to a submenu
const submenuWidth = menuWidth * scaling // Assuming a similar width as the parent
const overlap = 4 * scaling // A small overlap to bridge the mouse path
// Check if there's enough space on the right
const globalPos = entry.mapToGlobal(0, 0) const globalPos = entry.mapToGlobal(0, 0)
const submenuWidth = Style.baseWidgetSize * 5.625 * scaling
const gap = 12 * scaling
const openLeft = (globalPos.x + entry.width + submenuWidth > Screen.width) const openLeft = (globalPos.x + entry.width + submenuWidth > Screen.width)
const anchorX = openLeft ? -submenuWidth - gap : entry.width + gap
// Position with overlap
const anchorX = openLeft ? -submenuWidth + overlap : entry.width - overlap
// Create submenu // Create submenu
entry.subMenu = Qt.createComponent("TrayMenu.qml").createObject(root, { entry.subMenu = Qt.createComponent("TrayMenu.qml").createObject(root, {