Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kalendar
Commits
44e966cd
Commit
44e966cd
authored
Nov 02, 2021
by
Claudio Cambra
Browse files
Fixed font corruption in month and week views
parent
e744c7ba
Pipeline
#93380
canceled with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/MultiDayView.qml
View file @
44e966cd
...
...
@@ -179,6 +179,7 @@ Item {
Layout.alignment
:
Qt
.
AlignLeft
|
Qt
.
AlignTop
padding
:
Kirigami
.
Units
.
smallSpacing
text
:
i18n
(
"
<b>Today</b>
"
)
renderType
:
Text
.
QtRendering
color
:
Kirigami
.
Theme
.
highlightColor
visible
:
gridItem
.
isToday
&&
gridItem
.
width
>
Kirigami
.
Units
.
gridUnit
*
5
}
...
...
@@ -186,9 +187,12 @@ Item {
Layout.alignment
:
Qt
.
AlignRight
|
Qt
.
AlignTop
text
:
gridItem
.
date
.
toLocaleDateString
(
Qt
.
locale
(),
gridItem
.
day
==
1
?
"
d MMM
"
:
"
d
"
)
renderType
:
Text
.
QtRendering
padding
:
Kirigami
.
Units
.
smallSpacing
visible
:
root
.
showDayIndicator
color
:
gridItem
.
isToday
?
Kirigami
.
Theme
.
highlightColor
:
(
!
gridItem
.
isCurrentMonth
?
Kirigami
.
Theme
.
disabledTextColor
:
Kirigami
.
Theme
.
textColor
)
color
:
gridItem
.
isToday
?
Kirigami
.
Theme
.
highlightColor
:
(
!
gridItem
.
isCurrentMonth
?
Kirigami
.
Theme
.
disabledTextColor
:
Kirigami
.
Theme
.
textColor
)
font.bold
:
gridItem
.
isToday
}
}
...
...
src/contents/ui/MultiDayViewIncidenceDelegate.qml
View file @
44e966cd
...
...
@@ -81,7 +81,8 @@ Rectangle {
elide
:
parent
.
spaceRestricted
?
Text
.
ElideNone
:
Text
.
ElideRight
// Eliding takes up space
font.weight
:
Font
.
Medium
font.pointSize
:
parent
.
spaceRestricted
?
Kirigami
.
Theme
.
smallFont
.
pointSize
:
Kirigami
.
Theme
.
defaultFont
.
pointSize
Kirigami
.
Theme
.
defaultFont
.
pointSize
renderType
:
Text
.
QtRendering
color
:
isOpenOccurrence
?
(
LabelUtils
.
isDarkColor
(
modelData
.
color
)
?
"
white
"
:
"
black
"
)
:
isInCurrentMonth
?
incidenceContents
.
textColor
:
incidenceContents
.
otherMonthTextColor
(
modelData
.
color
)
...
...
src/contents/ui/WeekView.qml
View file @
44e966cd
...
...
@@ -677,8 +677,9 @@ Kirigami.Page {
font.pointSize
:
parent
.
isTinyHeight
?
Kirigami
.
Theme
.
smallFont
.
pointSize
:
Kirigami
.
Theme
.
defaultFont
.
pointSize
font.weight
:
Font
.
Medium
renderType
:
Text
.
QtRendering
color
:
isOpenOccurrence
?
(
LabelUtils
.
isDarkColor
(
modelData
.
color
)
?
"
white
"
:
"
black
"
)
:
incidenceContents
.
textColor
incidenceContents
.
textColor
}
RowLayout
{
...
...
@@ -700,6 +701,7 @@ Kirigami.Page {
horizontalAlignment
:
Text
.
AlignRight
text
:
modelData
.
startTime
.
toLocaleTimeString
(
Qt
.
locale
(),
Locale
.
NarrowFormat
)
+
"
-
"
+
modelData
.
endTime
.
toLocaleTimeString
(
Qt
.
locale
(),
Locale
.
NarrowFormat
)
wrapMode
:
Text
.
Wrap
renderType
:
Text
.
QtRendering
color
:
isOpenOccurrence
?
(
LabelUtils
.
isDarkColor
(
modelData
.
color
)
?
"
white
"
:
"
black
"
)
:
incidenceContents
.
textColor
visible
:
parent
.
width
>
Kirigami
.
Units
.
gridUnit
*
3
...
...
Claudio Cambra
@clau-cambra
mentioned in issue
#57 (closed)
·
Nov 02, 2021
mentioned in issue
#57 (closed)
mentioned in issue #57
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment