mirror of
https://github.com/SimpleMobileTools/Simple-Calendar.git
synced 2025-02-17 12:20:51 +01:00
Merge pull request #1339 from Honk2/concurrent_events_in_weekview
fix #1332 concurrent zero duration in week view
This commit is contained in:
commit
d4f741fa9f
@ -402,7 +402,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
|
||||
if (!event.getIsAllDay() && Formatter.getDayCodeFromDateTime(startDateTime) == Formatter.getDayCodeFromDateTime(endDateTime)) {
|
||||
val startMinutes = startDateTime.minuteOfDay
|
||||
val duration = endDateTime.minuteOfDay - startMinutes
|
||||
val range = Range(startMinutes, startMinutes + duration)
|
||||
val range = Range(startMinutes, startMinutes + maxOf(1,duration))
|
||||
val eventWeekly = EventWeeklyView(event.id!!, range)
|
||||
|
||||
val dayCode = Formatter.getDayCodeFromDateTime(startDateTime)
|
||||
@ -428,7 +428,7 @@ class WeekFragment : Fragment(), WeeklyCalendar {
|
||||
|
||||
val startMinutes = startDateTime.minuteOfDay
|
||||
val duration = endDateTime.minuteOfDay - startMinutes
|
||||
val range = Range(startMinutes, startMinutes + duration)
|
||||
val range = Range(startMinutes, startMinutes + maxOf(1, duration))
|
||||
|
||||
var overlappingEvents = 0
|
||||
var currentEventOverlapIndex = 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user