Tooltips: proper tooltip service

This commit is contained in:
ItsLemmy
2025-09-28 10:51:56 -04:00
parent 8dda007847
commit fc1742e167
15 changed files with 151 additions and 50 deletions
+3 -5
View File
@@ -49,9 +49,7 @@ Item {
Connections {
target: root
function onTooltipTextChanged() {
if (PanelService.tooltip.visible) {
PanelService.tooltip.updateText(root.tooltipText)
}
TooltipService.updateText(root.tooltipText)
}
}
@@ -221,7 +219,7 @@ Item {
onEntered: {
hovered = true
root.entered()
PanelService.tooltip.show(pill, root.tooltipText, BarService.getTooltipDirection(), Style.tooltipDelayLong)
TooltipService.show(pill, root.tooltipText, BarService.getTooltipDirection(), Style.tooltipDelayLong)
if (disableOpen || forceClose) {
return
}
@@ -235,7 +233,7 @@ Item {
if (!forceOpen && !forceClose) {
hide()
}
PanelService.tooltip.hide()
TooltipService.hide()
}
onClicked: function (mouse) {
if (mouse.button === Qt.LeftButton) {
+3 -5
View File
@@ -61,9 +61,7 @@ Item {
Connections {
target: root
function onTooltipTextChanged() {
if (PanelService.tooltip.visible) {
PanelService.tooltip.updateText(root.tooltipText)
}
TooltipService.updateText(root.tooltipText)
}
}
@@ -262,7 +260,7 @@ Item {
onEntered: {
hovered = true
root.entered()
PanelService.tooltip.show(pill, root.tooltipText, BarService.getTooltipDirection(), Style.tooltipDelayLong)
TooltipService.show(pill, root.tooltipText, BarService.getTooltipDirection(), Style.tooltipDelayLong)
if (disableOpen || forceClose) {
return
}
@@ -276,7 +274,7 @@ Item {
if (!forceOpen && !forceClose) {
hide()
}
PanelService.tooltip.hide()
TooltipService.hide()
}
onClicked: function (mouse) {
if (mouse.button === Qt.LeftButton) {
+2 -2
View File
@@ -329,11 +329,11 @@ Item {
acceptedButtons: Qt.LeftButton
onEntered: {
if ((windowTitle !== "") && (barPosition === "left" || barPosition === "right") || (scrollingMode === "never")) {
PanelService.tooltip.show(root, windowTitle, BarService.getTooltipDirection())
TooltipService.show(root, windowTitle, BarService.getTooltipDirection())
}
}
onExited: {
PanelService.tooltip.hide()
TooltipService.hide()
}
}
}
+3 -3
View File
@@ -114,14 +114,14 @@ Rectangle {
hoverEnabled: true
onEntered: {
if (!PanelService.getPanel("calendarPanel")?.active) {
PanelService.tooltip.show(root, I18n.tr("clock.tooltip"), BarService.getTooltipDirection())
TooltipService.show(root, I18n.tr("clock.tooltip"), BarService.getTooltipDirection())
}
}
onExited: {
PanelService.tooltip.hide()
TooltipService.hide()
}
onClicked: {
PanelService.tooltip.hide()
TooltipService.hide()
PanelService.getPanel("calendarPanel")?.toggle(this)
}
}
+2 -2
View File
@@ -376,11 +376,11 @@ Item {
onEntered: {
if ((tooltipText !== "") && (barPosition === "left" || barPosition === "right") || (scrollingMode === "never")) {
PanelService.tooltip.show(root, tooltipText, BarService.getTooltipDirection())
TooltipService.show(root, tooltipText, BarService.getTooltipDirection())
}
}
onExited: {
PanelService.tooltip.hide()
TooltipService.hide()
}
}
}
+2 -2
View File
@@ -98,8 +98,8 @@ Rectangle {
}
}
}
onEntered: PanelService.tooltip.show(taskbarItem, taskbarItem.modelData.title || taskbarItem.modelData.appId || "Unknown app.", BarService.getTooltipDirection())
onExited: PanelService.tooltip.hide()
onEntered: TooltipService.show(taskbarItem, taskbarItem.modelData.title || taskbarItem.modelData.appId || "Unknown app.", BarService.getTooltipDirection())
onExited: TooltipService.hide()
}
}
}
+2 -2
View File
@@ -135,8 +135,8 @@ Rectangle {
}
}
}
onEntered: PanelService.tooltip.show(trayIcon, modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item", BarService.getTooltipDirection())
onExited: PanelService.tooltip.hide()
onEntered: TooltipService.show(trayIcon, modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item", BarService.getTooltipDirection())
onExited: TooltipService.hide()
}
}
}
+3 -3
View File
@@ -474,7 +474,7 @@ Variants {
anyAppHovered = true
const appName = appButton.appTitle || appButton.appId || "Unknown"
const tooltipText = appName.length > 40 ? appName.substring(0, 37) + "..." : appName
PanelService.tooltip.show(appButton, tooltipText, "top")
TooltipService.show(appButton, tooltipText, "top")
if (autoHide) {
showTimer.stop()
hideTimer.stop()
@@ -484,7 +484,7 @@ Variants {
onExited: {
anyAppHovered = false
PanelService.tooltip.hide()
TooltipService.hide()
if (autoHide && !dockHovered && !peekHovered && !menuHovered) {
hideTimer.restart()
}
@@ -500,7 +500,7 @@ Variants {
// Close any other existing context menu first
root.closeAllContextMenus()
// Hide tooltip when showing context menu
PanelService.tooltip.hide()
TooltipService.hide()
contextMenu.show(appButton, modelData.toplevel || modelData)
return
}
+7 -8
View File
@@ -14,7 +14,7 @@ PopupWindow {
property int padding: Style.marginM
property int delay: 0
property int hideDelay: 0
property int maxWidth: 340
property int maxWidth: 320
property real scaling: 1.0
property int animationDuration: Style.animationFast
property real animationScale: 0.85
@@ -25,7 +25,7 @@ PopupWindow {
property real anchorY: 0
property bool isPositioned: false
property bool pendingShow: false
property bool animatingOut: false
property bool animatingOut: true
visible: false
color: Color.transparent
@@ -110,11 +110,7 @@ PopupWindow {
if (!target || !tipText || tipText === "")
return
if (showDelay !== undefined) {
delay = showDelay
} else {
delay = Style.tooltipDelay
}
delay = showDelay
// Stop any running timers and animations
hideTimer.stop()
@@ -144,8 +140,9 @@ PopupWindow {
// Function to position and display the tooltip
function positionAndShow() {
if (!targetItem || !pendingShow)
if (!targetItem || !targetItem.parent || !pendingShow) {
return
}
// Get screen dimensions - try multiple methods
var screenWidth = Screen.width
@@ -393,6 +390,8 @@ PopupWindow {
color: Color.mOnSurfaceVariant
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
width: root.maxWidth
}
}
}