zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-05-30 17:28:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: events tooltip use fixed font with improved time formating

Browse Source
This commit is contained in:
ItsLemmy
2025-11-11 06:54:13 -05:00
parent a6f25cc9d5
commit 9bccf4ff56
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Panels/Calendar/CalendarPanel.qml
+13 -12
View File
@@ -604,18 +604,19 @@ SmartPanel {
const events = parent.parent.parent.parent.getEventsForDate(modelData.year, modelData.month, modelData.day)
if (events.length > 0) {
const summaries = events.map(event => {
if (isAllDayEvent(event)) {
return event.summary
} else {
const start = new Date(event.start * 1000)
const startFormatted = start.toLocaleTimeString(I18n.locale, Locale.ShortFormat)
const end = new Date(event.end * 1000)
const endFormatted = end.toLocaleTimeString(I18n.locale, Locale.ShortFormat)
return `${startFormatted}-${endFormatted} ${event.summary}`
}
}).join('\n')
TooltipService.show(Screen, parent, summaries)
TooltipService.updateText(summaries)
if (isAllDayEvent(event)) {
return event.summary
} else {
// Always format with '0' padding to ensure proper horizontal alignment
const timeFormat = Settings.data.location.use12hourFormat ? "hh:mm AP" : "HH:mm"
const start = new Date(event.start * 1000)
const startFormatted = I18n.locale.toString(start, timeFormat)
const end = new Date(event.end * 1000)
const endFormatted = I18n.locale.toString(end, timeFormat)
return `${startFormatted}-${endFormatted} ${event.summary}`
}
}).join('\n')
TooltipService.show(screen, parent, summaries, "auto", Style.tooltipDelay, Settings.data.ui.fontFixed)
}
}
Modules/Tooltip/Tooltip.qml
+4 -1
View File
@@ -108,7 +108,7 @@ PopupWindow {
}
// Function to show tooltip
function show(screen, target, tipText, customDirection, showDelay) {
function show(screen, target, tipText, customDirection, showDelay, fontFamily) {
if (!screen || !target || !tipText || tipText === "")
return
@@ -139,6 +139,8 @@ PopupWindow {
direction = "auto"
}
tooltipText.family = fontFamily ? fontFamily : Settings.data.ui.fontDefault
// Start show timer
showTimer.start()
}
@@ -404,6 +406,7 @@ PopupWindow {
anchors.margins: root.padding
text: root.text
pointSize: Style.fontSizeS
family: Settings.data.ui.fontFixed
color: Color.mOnSurfaceVariant
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
Services/UI/TooltipService.qml
+2 -2
View File
@@ -15,7 +15,7 @@ Singleton {
Tooltip {}
}
function show(screen, target, text, direction, delay) {
function show(screen, target, text, direction, delay, fontFamily) {
if (!Settings.data.ui.tooltipsEnabled) {
return
}
@@ -78,7 +78,7 @@ Singleton {
})
// Show the tooltip
newTooltip.show(screen, target, text, direction || "auto", delay || Style.tooltipDelay)
newTooltip.show(screen, target, text, direction || "auto", delay || Style.tooltipDelay, fontFamily)
return newTooltip
} else {