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
2dcdcfb4
Commit
2dcdcfb4
authored
Jan 11, 2022
by
Claudio Cambra
Browse files
Fix errors about loader prop, time marker now appears correctly too
parent
fcab4f9c
Pipeline
#121763
passed with stage
in 5 minutes and 1 second
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/HourlyView.qml
View file @
2dcdcfb4
...
...
@@ -656,7 +656,8 @@ Kirigami.Page {
const
viewHeight
=
(
applicationWindow
().
height
-
applicationWindow
().
pageStack
.
globalToolBar
.
height
-
headerBottomSeparator
.
height
-
allDayHeader
.
height
-
headerTopSeparator
.
height
-
headingRow
.
height
-
Kirigami
.
Units
.
gridUnit
);
// Since we position with anchors, height is 0 -- must calc manually
let
yPos
=
(
currentTimeMarkerLoader
.
item
.
y
/
dayHeight
)
-
((
viewHeight
/
2
)
/
dayHeight
)
const
timeMarkerY
=
(
root
.
currentDate
.
getHours
()
*
root
.
gridLineWidth
)
+
(
hourlyView
.
minuteHeight
*
root
.
minutesFromStartOfDay
)
-
(
height
/
2
)
-
(
root
.
gridLineWidth
/
2
)
let
yPos
=
(
timeMarkerY
/
dayHeight
)
-
((
viewHeight
/
2
)
/
dayHeight
)
yPos
=
Math
.
max
(
0.0
,
yPos
);
yPos
=
vScrollBar
.
size
?
Math
.
min
(
vScrollBar
.
size
,
yPos
)
:
Math
.
min
(
1.0
,
yPos
);
...
...
@@ -1120,6 +1121,7 @@ Kirigami.Page {
id
:
currentTimeMarkerLoader
active
:
root
.
currentDate
>=
viewLoader
.
startDate
&&
viewLoader
.
daysFromWeekStart
<
root
.
daysToShow
sourceComponent
:
Rectangle
{
id
:
currentTimeMarker
...
...
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