1 files changed, 9 insertions, 4 deletions
diff --git a/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt b/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt
index ae749fb..4a352fc 100644
--- a/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt
+++ b/android/app/src/main/java/org/terst/doot/widget/ui/DootWidget.kt
@@ -94,8 +94,13 @@ fun WidgetRoot(items: List<WidgetItem>, now: Instant, isRefreshing: Boolean) {
     val scheduledEvents = allScheduled.filter { it.type != "task" || Instant.parse(it.start!!) >= now }
     val floating = rest.filter { it.start == null }
     val fragments = SlotPacker.pack(pastTasks + floating, scheduledEvents, now)
-    val gridStart = calcGridStart(scheduledEvents, nowZoned.hour)
-    val gridEnd = calcGridEnd(scheduledEvents, nowZoned.hour)
+    // Grid bounds must only reflect TODAY's events -- a tomorrow event's hour-of-day
+    // would otherwise stretch today's grid (see calcGridStart/calcGridEnd), manufacturing
+    // empty hour rows that push the non-scrolling TomorrowSection below the widget's
+    // visible area.
+    val todayScheduledEvents = scheduledEvents.filter { Instant.parse(it.start!!) < tomorrowStart }
+    val gridStart = calcGridStart(todayScheduledEvents, nowZoned.hour)
+    val gridEnd = calcGridEnd(todayScheduledEvents, nowZoned.hour)
 
     val tomorrowItems = scheduledEvents
         .filter { Instant.parse(it.start!!) >= tomorrowStart && Instant.parse(it.start!!) < tomorrowEnd }
@@ -479,7 +484,7 @@ private fun hourLabel(hour: Int): String = when {
     else       -> "${hour - 12}p"
 }
 
-private fun calcGridStart(events: List<WidgetItem>, nowHour: Int): Int {
+internal fun calcGridStart(events: List<WidgetItem>, nowHour: Int): Int {
     val earliest = events.mapNotNull { it.start }
         .mapNotNull { runCatching { Instant.parse(it) }.getOrNull() }
         .minOrNull()
@@ -488,7 +493,7 @@ private fun calcGridStart(events: List<WidgetItem>, nowHour: Int): Int {
     return maxOf(0, minOf(earliest, nowHour) - 1)
 }
 
-private fun calcGridEnd(events: List<WidgetItem>, nowHour: Int): Int {
+internal fun calcGridEnd(events: List<WidgetItem>, nowHour: Int): Int {
     val latest = events.mapNotNull { it.end }
         .mapNotNull { runCatching { Instant.parse(it) }.getOrNull() }
         .maxOrNull()