lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Notification: layout changes

Browse Source
This commit is contained in:
Ly-sec
2025-09-22 23:56:18 +02:00
parent 21d331c232
commit 489ce76d2a
2 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Dock/DockMenu.qml
+23 -19
View File
@@ -19,7 +19,7 @@ PopupWindow {
signal requestClose
implicitWidth: 160 * scaling
implicitWidth: 140 * scaling
implicitHeight: contextMenuColumn.implicitHeight + (Style.marginM * scaling * 2)
color: Color.transparent
visible: false
@@ -75,7 +75,14 @@ PopupWindow {
id: menuMouseArea
anchors.fill: parent
hoverEnabled: true
onClicked: root.hide() // Close when clicking on the background (outside menu content)
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: function (mouse) {
if (mouse.button === Qt.RightButton) {
root.hide() // Close on right-click
} else {
root.hide() // Close when clicking on the background (outside menu content)
}
}
}
Shortcut {
@@ -105,11 +112,11 @@ PopupWindow {
anchors.margins: Style.marginM * scaling
spacing: 0
// Activate/Focus item
// Focus item
Rectangle {
width: parent.width
height: 32 * scaling
color: activateMouseArea.containsMouse ? Qt.alpha(Color.mSecondary, 0.2) : Color.transparent
color: activateMouseArea.containsMouse ? Color.mTertiary : Color.transparent
radius: Style.radiusXS * scaling
Row {
@@ -121,20 +128,14 @@ PopupWindow {
NIcon {
icon: "eye"
font.pointSize: Style.fontSizeL * scaling
color: Color.mOnSurface
color: activateMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
NText {
text: {
if (!root.toplevel)
return "Activate"
// Check if this toplevel is active by comparing with ToplevelManager.activeToplevel
const isActive = ToplevelManager.activeToplevel && ToplevelManager.activeToplevel === root.toplevel
return isActive ? "Focus" : "Activate"
}
text: "Focus"
font.pointSize: Style.fontSizeS * scaling
color: Color.mOnSurface
color: activateMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
}
@@ -150,6 +151,7 @@ PopupWindow {
root.toplevel.activate()
}
root.hide()
root.requestClose()
}
}
}
@@ -158,7 +160,7 @@ PopupWindow {
Rectangle {
width: parent.width
height: 32 * scaling
color: pinMouseArea.containsMouse ? Qt.alpha(Color.mTertiary, 0.2) : Color.transparent
color: pinMouseArea.containsMouse ? Color.mTertiary : Color.transparent
radius: Style.radiusXS * scaling
Row {
@@ -174,7 +176,7 @@ PopupWindow {
return root.isAppPinned(root.toplevel.appId) ? "pinned-off" : "pin"
}
font.pointSize: Style.fontSizeL * scaling
color: Color.mOnSurface
color: pinMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
@@ -185,7 +187,7 @@ PopupWindow {
return root.isAppPinned(root.toplevel.appId) ? "Unpin" : "Pin"
}
font.pointSize: Style.fontSizeS * scaling
color: Color.mOnSurface
color: pinMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
}
@@ -201,6 +203,7 @@ PopupWindow {
root.toggleAppPin(root.toplevel.appId)
}
root.hide()
root.requestClose()
}
}
}
@@ -209,7 +212,7 @@ PopupWindow {
Rectangle {
width: parent.width
height: 32 * scaling
color: closeMouseArea.containsMouse ? Qt.alpha(Color.mPrimary, 0.2) : Color.transparent
color: closeMouseArea.containsMouse ? Color.mTertiary : Color.transparent
radius: Style.radiusXS * scaling
Row {
@@ -221,14 +224,14 @@ PopupWindow {
NIcon {
icon: "x"
font.pointSize: Style.fontSizeL * scaling
color: closeMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurface
color: closeMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
NText {
text: "Close"
font.pointSize: Style.fontSizeS * scaling
color: closeMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurface
color: closeMouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
anchors.verticalCenter: parent.verticalCenter
}
}
@@ -253,6 +256,7 @@ PopupWindow {
Logger.warn("DockMenu", "Cannot close app - invalid toplevel reference")
}
root.hide()
root.requestClose()
}
}
}