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

Revert "Possibly fixed #117, format and also change a tiny thing in ActiveWindow"

Browse source 
This reverts commit 1e52e7ca40.
This commit is contained in:
Ly-sec 2025-08-31 11:14:23 +02:00
parent 1e52e7ca40
commit 6d2f4d51a2
2 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Modules/Bar/Widgets/ActiveWindow.qml
View file

@ -41,15 +41,14 @@ Row {
NText {
id: fullTitleMetrics
visible: false
text: getTitle()
font.pointSize: Style.fontSizeS * scaling
font.weight: Style.fontWeightMedium
text: titleText.text
font: titleText.font
}
Rectangle {
// Let the Rectangle size itself based on its content (the Row)
visible: root.visible
width: row.width + Style.marginS * scaling
width: row.width + Style.marginM * scaling * 2
height: Math.round(Style.capsuleHeight * scaling)
radius: Math.round(Style.radiusM * scaling)
color: Color.mSurfaceVariant
@ -61,7 +60,6 @@ Row {
anchors.fill: parent
anchors.leftMargin: Style.marginS * scaling
anchors.rightMargin: Style.marginS * scaling
clip: true
Row {
id: row
@ -88,10 +86,9 @@ Row {
NText {
id: titleText
// For short titles, show full. For long titles, truncate and expand on hover
width: mouseArea.containsMouse ? Math.min(fullTitleMetrics.contentWidth + 8,
400 * scaling) : Math.min(fullTitleMetrics.contentWidth + 12,
200 * scaling)
// Collapsed width when not hovered, expand on hover
width: mouseArea.containsMouse ? Math.min(fullTitleMetrics.contentWidth + (Style.marginS * scaling),
400 * scaling) : (minWidth * scaling)
horizontalAlignment: Text.AlignLeft
text: getTitle()
font.pointSize: Style.fontSizeS * scaling

79
Modules/Bar/Widgets/MediaMini.qml
View file

@ -26,9 +26,8 @@ Row {
NText {
id: fullTitleMetrics
visible: false
text: getTitle()
font.pointSize: Style.fontSizeS * scaling
font.weight: Style.fontWeightMedium
text: titleText.text
font: titleText.font
}
Rectangle {
@ -50,37 +49,6 @@ Row {
width: 200 * scaling
}
// Mouse area for hover detection - direct child of Rectangle
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onClicked: mouse => {
if (mouse.button === Qt.LeftButton) {
MediaService.playPause()
} else if (mouse.button == Qt.RightButton) {
MediaService.next()
// Need to hide the tooltip instantly
tooltip.visible = false
} else if (mouse.button == Qt.MiddleButton) {
MediaService.previous()
// Need to hide the tooltip instantly
tooltip.visible = false
}
}
onEntered: {
if (tooltip.text !== "") {
tooltip.show()
}
}
onExited: {
tooltip.hide()
}
}
Item {
id: mainContainer
anchors.fill: parent
@ -172,18 +140,18 @@ Row {
NText {
id: titleText
// If hovered, show up to 400 pixels, otherwise show up to 120 pixels
width: (mouseArea.containsMouse) ? Math.min(fullTitleMetrics.contentWidth + (Style.marginS * scaling),
400 * scaling) : Math.min(
fullTitleMetrics.contentWidth + (Style.marginS * scaling), 120 * scaling)
// If hovered or just switched window, show up to 400 pixels
// If not hovered show up to 120 pixels
width: (mouseArea.containsMouse) ? Math.min(fullTitleMetrics.contentWidth,
400 * scaling) : Math.min(fullTitleMetrics.contentWidth,
120 * scaling)
text: getTitle()
font.pointSize: Style.fontSizeS * scaling
font.weight: Style.fontWeightMedium
elide: mouseArea.containsMouse ? Text.ElideNone : Text.ElideRight
elide: Text.ElideRight
anchors.verticalCenter: parent.verticalCenter
verticalAlignment: Text.AlignVCenter
color: Color.mTertiary
clip: true
Behavior on width {
NumberAnimation {
@ -193,6 +161,37 @@ Row {
}
}
}
// Mouse area for hover detection
MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
onClicked: mouse => {
if (mouse.button === Qt.LeftButton) {
MediaService.playPause()
} else if (mouse.button == Qt.RightButton) {
MediaService.next()
// Need to hide the tooltip instantly
tooltip.visible = false
} else if (mouse.button == Qt.MiddleButton) {
MediaService.previous()
// Need to hide the tooltip instantly
tooltip.visible = false
}
}
onEntered: {
if (tooltip.text !== "") {
tooltip.show()
}
}
onExited: {
tooltip.hide()
}
}
}
}