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
65b4e72b
Commit
65b4e72b
authored
Nov 11, 2021
by
Claudio Cambra
Browse files
Fixed time labels sometimes overlapping with icons in schedule view cards
parent
56254c63
Pipeline
#96344
passed with stage
in 6 minutes and 18 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/ScheduleView.qml
View file @
65b4e72b
...
...
@@ -31,6 +31,7 @@ Kirigami.Page {
property
bool
initialMonth
:
true
readonly
property
bool
isLarge
:
width
>
Kirigami
.
Units
.
gridUnit
*
30
readonly
property
bool
isDark
:
LabelUtils
.
isDarkColor
(
Kirigami
.
Theme
.
backgroundColor
)
property
real
maxTimeLabelWidth
:
0
onSelectedDateChanged
:
moveToSelected
()
...
...
@@ -389,7 +390,7 @@ Kirigami.Page {
Behavior
on
color
{
ColorAnimation
{
duration
:
Kirigami
.
Units
.
shortDuration
;
easing.type
:
Easing
.
OutCubic
}
}
text
:
{
if
(
incidenceCard
.
multiday
)
{
return
i18n
(
"
%1 (Day %2 of %3)
"
,
modelData
.
text
,
incidenceCard
.
dayOfMultidayIncidence
,
incidenceCard
.
incidenceDays
);
return
i18n
c
(
"
%1 is the name of the event
"
,
"
%1 (Day %2 of %3)
"
,
modelData
.
text
,
incidenceCard
.
dayOfMultidayIncidence
,
incidenceCard
.
incidenceDays
);
}
else
{
return
modelData
.
text
;
}
...
...
@@ -434,8 +435,8 @@ Kirigami.Page {
QQC2.Label
{
Layout.fillHeight
:
true
// This way all the icons are aligned
Layout.maximumWidth
:
Kirigami
.
Units
.
gridUnit
*
7
Layout.minimumWidth
:
Kirigami
.
Units
.
gridUnit
*
7
Layout.maximumWidth
:
root
.
maxTimeLabelWidth
Layout.minimumWidth
:
root
.
maxTimeLabelWidth
Layout.column
:
root
.
isLarge
?
2
:
0
Layout.row
:
root
.
isLarge
?
0
:
1
...
...
@@ -459,6 +460,7 @@ Kirigami.Page {
i18n
(
"
Runs All Day
"
)
}
}
Component.onCompleted
:
if
(
implicitWidth
>
root
.
maxTimeLabelWidth
)
root
.
maxTimeLabelWidth
=
implicitWidth
}
}
...
...
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