diff options
Diffstat (limited to 'countdown.hs')
-rwxr-xr-x | countdown.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/countdown.hs b/countdown.hs index 565e9c3..54f79f5 100755 --- a/countdown.hs +++ b/countdown.hs | |||
@@ -240,7 +240,7 @@ countdownWidget isSimulated t = | |||
240 | currentEntry = fromMaybe (str "none") $ calendarWidget <$> getCurrentCalendarEntry t | 240 | currentEntry = fromMaybe (str "none") $ calendarWidget <$> getCurrentCalendarEntry t |
241 | nextEntry = fromMaybe (str "none") $ calendarWidget <$> getNextCalendarEntry t | 241 | nextEntry = fromMaybe (str "none") $ calendarWidget <$> getNextCalendarEntry t |
242 | 242 | ||
243 | calendarWidget CalendarEntry{..} = vBox [eventCountdown, str "\n", box] | 243 | calendarWidget CalendarEntry{..} = box -- vBox [eventCountdown, str "\n", box] |
244 | where | 244 | where |
245 | timeUntilActive = (calBeginTime `addLocalTime` yearStart t) `diffLocalTime` t | 245 | timeUntilActive = (calBeginTime `addLocalTime` yearStart t) `diffLocalTime` t |
246 | eventCountdown = if timeUntilActive >= 0 then | 246 | eventCountdown = if timeUntilActive >= 0 then |
@@ -250,8 +250,10 @@ countdownWidget isSimulated t = | |||
250 | hBox [str $ showTime (-timeUntilActive) ++ " ago", | 250 | hBox [str $ showTime (-timeUntilActive) ++ " ago", |
251 | padLeft Max $ str $ showCosmicTime (-timeUntilActive) ++ " ago"] | 251 | padLeft Max $ str $ showCosmicTime (-timeUntilActive) ++ " ago"] |
252 | years = fromRational $ toCosmicTime calBeginTime | 252 | years = fromRational $ toCosmicTime calBeginTime |
253 | box = borderWithLabel (txt calTitle) $ vBox [ | 253 | box = vBox [ |
254 | hCenter $ txtWrap $ calSubtitle, | 254 | str "\n", |
255 | hCenter $ txt calTitle, | ||
256 | hCenter $ txt calSubtitle, | ||
255 | str "\n", | 257 | str "\n", |
256 | hBox [ | 258 | hBox [ |
257 | str $ formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" $ calBeginTime `addLocalTime` yearStart t, | 259 | str $ formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" $ calBeginTime `addLocalTime` yearStart t, |