mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
SessionMenu: fix warning
This commit is contained in:
@@ -724,59 +724,6 @@ SmartPanel {
|
||||
// Custom power button component
|
||||
component PowerButton: Rectangle {
|
||||
id: buttonRoot
|
||||
// Keybind indicator and countdown text at far right
|
||||
Item {
|
||||
id: indicatorGroup
|
||||
width: (countdownText.visible ? countdownText.width + Style.marginXS : 0) + numberIndicatorRect.width
|
||||
height: numberIndicatorRect.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: Style.marginM
|
||||
z: 20
|
||||
|
||||
// Countdown as plain text (left of keybind)
|
||||
NText {
|
||||
id: countdownText
|
||||
visible: !Settings.data.sessionMenu.showHeader && buttonRoot.pending && timerActive && pendingAction === modelData.action
|
||||
anchors.left: parent.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: Math.ceil(timeRemaining / 1000)
|
||||
pointSize: Style.fontSizeS
|
||||
color: Color.mPrimary
|
||||
font.weight: Style.fontWeightBold
|
||||
}
|
||||
|
||||
// Keybind indicator
|
||||
Rectangle {
|
||||
id: numberIndicatorRect
|
||||
anchors.left: countdownText.visible ? countdownText.right : parent.left
|
||||
anchors.leftMargin: countdownText.visible ? Style.marginXS : 0
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
width: Math.max(Style.marginXL, labelText.implicitWidth + Style.marginM)
|
||||
height: Style.marginXL
|
||||
radius: Math.min(Style.radiusM, height / 2)
|
||||
color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mOnPrimary : Qt.alpha(Color.mSurfaceVariant, 0.5)
|
||||
border.width: Style.borderS
|
||||
border.color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mOnPrimary : Color.mOutline
|
||||
visible: (buttonRoot.keybind !== "") && !buttonRoot.pending
|
||||
|
||||
NText {
|
||||
id: labelText
|
||||
anchors.centerIn: parent
|
||||
text: buttonRoot.keybind
|
||||
pointSize: Style.fontSizeS
|
||||
font.weight: Style.fontWeightBold
|
||||
color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mPrimary : Color.mOnSurface
|
||||
|
||||
Behavior on color {
|
||||
ColorAnimation {
|
||||
duration: Style.animationFast
|
||||
easing.type: Easing.OutCirc
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
property string icon: ""
|
||||
property string title: ""
|
||||
@@ -815,6 +762,7 @@ SmartPanel {
|
||||
}
|
||||
|
||||
Item {
|
||||
id: contentItem
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.marginM
|
||||
|
||||
@@ -846,13 +794,66 @@ SmartPanel {
|
||||
}
|
||||
}
|
||||
|
||||
// Keybind indicator and countdown text at far right
|
||||
Item {
|
||||
id: indicatorGroup
|
||||
width: (countdownText.visible ? countdownText.width + Style.marginXS : 0) + numberIndicatorRect.width
|
||||
height: numberIndicatorRect.height
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.right: parent.right
|
||||
z: 20
|
||||
|
||||
// Countdown as plain text (left of keybind)
|
||||
NText {
|
||||
id: countdownText
|
||||
visible: !Settings.data.sessionMenu.showHeader && buttonRoot.pending && timerActive && pendingAction === modelData.action
|
||||
anchors.left: parent.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: Math.ceil(timeRemaining / 1000)
|
||||
pointSize: Style.fontSizeS
|
||||
color: Color.mPrimary
|
||||
font.weight: Style.fontWeightBold
|
||||
}
|
||||
|
||||
// Keybind indicator
|
||||
Rectangle {
|
||||
id: numberIndicatorRect
|
||||
anchors.left: countdownText.visible ? countdownText.right : parent.left
|
||||
anchors.leftMargin: countdownText.visible ? Style.marginXS : 0
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
width: Math.max(Style.marginXL, labelText.implicitWidth + Style.marginM)
|
||||
height: Style.marginXL
|
||||
radius: Math.min(Style.radiusM, height / 2)
|
||||
color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mOnPrimary : Qt.alpha(Color.mSurfaceVariant, 0.5)
|
||||
border.width: Style.borderS
|
||||
border.color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mOnPrimary : Color.mOutline
|
||||
visible: (buttonRoot.keybind !== "") && !buttonRoot.pending
|
||||
|
||||
NText {
|
||||
id: labelText
|
||||
anchors.centerIn: parent
|
||||
text: buttonRoot.keybind
|
||||
pointSize: Style.fontSizeS
|
||||
font.weight: Style.fontWeightBold
|
||||
color: (buttonRoot.isSelected || buttonRoot.effectiveHover) ? Color.mPrimary : Color.mOnSurface
|
||||
|
||||
Behavior on color {
|
||||
ColorAnimation {
|
||||
duration: Style.animationFast
|
||||
easing.type: Easing.OutCirc
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Text content in the middle
|
||||
ColumnLayout {
|
||||
anchors.left: iconElement.right
|
||||
anchors.right: numberIndicator.visible ? numberIndicator.left : parent.right
|
||||
anchors.right: indicatorGroup.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.leftMargin: Style.marginL
|
||||
anchors.rightMargin: numberIndicator.visible ? Style.marginM : 0
|
||||
anchors.rightMargin: Style.marginM
|
||||
spacing: 0
|
||||
|
||||
NText {
|
||||
|
||||
Reference in New Issue
Block a user