From f5383bbb4a3b21c5dcb85c72f50c9eefae377186 Mon Sep 17 00:00:00 2001 From: atsvirchkova Date: Fri, 27 Nov 2020 10:12:31 +0100 Subject: [PATCH 1/2] Timeline UI - fix dutation for running TE (win) --- .../TogglDesktop/ui/ViewModels/TimelineViewModel.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs index 46ee4040e5..cfffdca5a9 100644 --- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs +++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs @@ -90,7 +90,7 @@ public TimelineViewModel() .Subscribe(h => CurrentTimeOffset = h); this.WhenAnyValue(x => x.CurrentTimeOffset).Where(_ => RunningTimeEntryBlock != null) .Select(off => Math.Max(TimelineConstants.MinTimeEntryBlockHeight, - CurrentTimeOffset - RunningTimeEntryBlock.VerticalOffset - 1)) + CurrentTimeOffset - RunningTimeEntryBlock.VerticalOffset)) .Subscribe(h => RunningTimeEntryBlock.Height = h); this.WhenAnyValue(x => x.TimeEntryBlocks, x => x.RunningTimeEntryBlock, x => x.IsTodaySelected, (blocks, running, isToday) => blocks?.Any() == true || (running != null && isToday)) @@ -202,7 +202,7 @@ private static Dictionary ConvertTimeEntriesToBlocks(Lis var startTime = entry.StartTime(); var ended = entry.GUID == runningEntry?.GUID - ? TimelineUtils.ConvertOffsetToUnixTime(currentTimeOffset - 1, selectedDate, TimelineConstants.ScaleModes[selectedScaleMode]) + ? TimelineUtils.ConvertOffsetToUnixTime(currentTimeOffset, selectedDate, TimelineConstants.ScaleModes[selectedScaleMode]) : entry.Ended; var height = ConvertTimeIntervalToHeight(startTime, Toggl.DateTimeFromUnix(ended), selectedScaleMode); var block = new TimeEntryBlock(entry.GUID, TimelineConstants.ScaleModes[selectedScaleMode], selectedDate) From 247995fc8bc23893b61c7e55077cda37cb507625 Mon Sep 17 00:00:00 2001 From: atsvirchkova Date: Fri, 27 Nov 2020 10:32:57 +0100 Subject: [PATCH 2/2] Timeline UI - change Z-order for running TE and current time line (win) --- .../TogglDesktop/ui/views/Timeline.xaml | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timeline.xaml b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timeline.xaml index 7c67257a8a..6290fa8709 100644 --- a/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timeline.xaml +++ b/src/ui/windows/TogglDesktop/TogglDesktop/ui/views/Timeline.xaml @@ -146,6 +146,26 @@ + + + + + + + + @@ -169,10 +189,7 @@ - + @@ -199,21 +216,6 @@ - - - - - - -