Merge pull request #290 from degemenc/master

If two events' start and end times are exactly equal to each other AND event gap is set, do not consider them as overlapping.
richardtop · Nov 19, 2020 · 7746388 · 7746388
2 parents 7908671 + fafe79d
commit 7746388
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Timeline/TimelineView.swift b/Source/Timeline/TimelineView.swift
@@ -414,8 +414,8 @@ public final class TimelineView: UIView {
         }
       } else {
         let lastEvent = overlappingEvents.last!
-        if longestEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) ||
-          lastEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) {
+        if (longestEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) && (longestEvent.descriptor.endDate != event.descriptor.startDate || style.eventGap <= 0.0)) ||
+          (lastEvent.descriptor.datePeriod.overlaps(event.descriptor.datePeriod) && (lastEvent.descriptor.endDate != event.descriptor.startDate || style.eventGap <= 0.0)) {
           overlappingEvents.append(event)
           continue
         }