Merge pull request #4781 from toggl-open-source/fix/timeline_ui/top_e…

…dge_resizing Use keepEndTimeFixed option everywhere in Timeline UI (win)
toggl-open-source · Dec 24, 2020 · 359d565 · 359d565
2 parents 8ed93a6 + 7484b0b
commit 359d565
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/Toggl.cs b/src/ui/windows/TogglDesktop/TogglDesktop/Toggl.cs
@@ -460,6 +460,14 @@ public static bool SetTimeEntryStartTimeStamp(string guid, long timeStamp)
         }
     }
 
+    public static bool SetTimeEntryStartTimeStampWithOption(string guid, long timeStamp, bool keepEndTimeFixed)
+    {
+        using (Performance.Measure("changing time entry start time stamp"))
+        {
+            return toggl_set_time_entry_start_timestamp_with_option(ctx, guid, timeStamp, keepEndTimeFixed);
+        }
+    }
+
     public static bool SetTimeEntryEndTimeStamp(string guid, long timeStamp)
     {
         using (Performance.Measure("changing time entry end time stamp"))

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineBlockViewModel.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineBlockViewModel.cs
@@ -96,8 +96,8 @@ public TimeEntryBlock(Toggl.TogglTimeEntryView te, int hourHeight, DateTime date
 
         public void ChangeStartTime()
         {
-            Toggl.SetTimeEntryStartTimeStamp(TimeEntryId,
-                (long)TimelineUtils.ConvertOffsetToUnixTime(VerticalOffset, DateCreated, _hourHeight));
+            Toggl.SetTimeEntryStartTimeStampWithOption(TimeEntryId,
+                (long)TimelineUtils.ConvertOffsetToUnixTime(VerticalOffset, DateCreated, _hourHeight), true);
         }
 
         public void ChangeEndTime()

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs b/src/ui/windows/TogglDesktop/TogglDesktop/ui/ViewModels/TimelineViewModel.cs
@@ -342,7 +342,7 @@ private static GapTimeEntryBlock GenerateRunningGapBlock(IEnumerable<TimeEntryBl
                     (offset, height) =>
                     {
                         var id = Toggl.Start("", "", 0, 0, "", "");
-                        Toggl.SetTimeEntryStartTimeStamp(id, (long)lastTimeEntry.Ended+1);
+                        Toggl.SetTimeEntryStartTimeStampWithOption(id, (long)lastTimeEntry.Ended+1, true);
                         return id;
                     })
                 {
@@ -374,7 +374,7 @@ public static void ChangeLastEntryStart(TimeEntryBlock item, List<TimeEntryBlock
         {
             var (first, last) = GetOverlappingPair(item, blocks);
             if (last == null) return;
-            Toggl.SetTimeEntryStartTimeStamp(last.TimeEntryId, (long)first.Ended);
+            Toggl.SetTimeEntryStartTimeStampWithOption(last.TimeEntryId, (long)first.Ended, true);
         }
 
         private static (TimeEntryBlock First, TimeEntryBlock Last) GetOverlappingPair(TimeEntryBlock item, IEnumerable<TimeEntryBlock> blocks)

diff --git a/src/ui/windows/TogglDesktop/TogglDesktop/utilities/TimelineUtils.cs b/src/ui/windows/TogglDesktop/TogglDesktop/utilities/TimelineUtils.cs
@@ -24,7 +24,7 @@ public static DateTime ConvertOffsetToDateTime(double height, DateTime date, dou
         public static void CreateAndEditRunningTimeEntryFrom(ulong started)
         {
             var teId = Toggl.Start("", "", 0, 0, "", "");
-            Toggl.SetTimeEntryStartTimeStamp(teId, (long)started);
+            Toggl.SetTimeEntryStartTimeStampWithOption(teId, (long)started, true);
             Toggl.Edit(teId, true, Toggl.Description);
         }