tweak widget code

1 files changed, 27 insertions, 30 deletions

diff --git a/countdown.hs b/countdown.hs
index 7d9299c..6e300ad 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -134,36 +134,33 @@ countdownWidget isSimulated t =
   (borderWithLabel (str "Progress through year") $
     (str "\n")
     <=>
-    ((borderWithLabel (str $ printf "%d" currentYear)
-      (str $ printf "%d day%s remain%s\n%s hour%s remain%s\n%s second%s remain%s"
-                                      daysLeft
-                                      (pluralize daysLeft)
-                                      (pluralizeVerb daysLeft)
-                                      (commasF 2 hoursLeft)
-                                      (pluralize $ (floor hoursLeft :: Integer))
-                                      (pluralizeVerb $ (floor hoursLeft :: Integer))
-                                      (commas secondsLeft)
-                                      (pluralize secondsLeft)
-                                      (pluralizeVerb secondsLeft)))
-     <+>
-     (borderWithLabel (str "Cosmic Countdown") $
-       (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
-       <=>
-       (str "\n\n")
-       <=>
-       (str $ printf "%s billion years ago" (commasF 9 $ cosmicYearsAgo / (1000*1000*1000)))
-       <=>
-       (str $ printf "%s million years ago" (commasF 6 $ cosmicYearsAgo / (1000*1000)))
-       <=>
-       (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
-       <=>
-       (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer))))
-     <=>
-     (borderWithLabel (str progressLabel) $
-         updateAttrMap
-         (A.mapAttrName yDoneAttr P.progressCompleteAttr .
-           A.mapAttrName yToDoAttr P.progressIncompleteAttr) $
-         progressBar Nothing (realToFrac $ yearElapsed // yearLength)))
+    (hCenter $ hBox
+     [ (borderWithLabel (str $ printf "%d" currentYear)
+         (str $ printf "%d day%s remain%s\n%s hour%s remain%s\n%s second%s remain%s"
+                        daysLeft
+                        (pluralize daysLeft)
+                        (pluralizeVerb daysLeft)
+                        (commasF 2 hoursLeft)
+                        (pluralize $ (floor hoursLeft :: Integer))
+                        (pluralizeVerb $ (floor hoursLeft :: Integer))
+                        (commas secondsLeft)
+                        (pluralize secondsLeft)
+                        (pluralizeVerb secondsLeft)))
+     , (borderWithLabel (str "Cosmic Countdown") $
+       vBox [ (str $ printf "%s years ago" (commas $ (floor cosmicYearsAgo :: Integer)))
+            , (str "\n\n")
+            -- , (str $ printf "%s billion years ago" (commasF 9 $ cosmicYearsAgo / (1000*1000*1000)))
+            -- , (str $ printf "%s million years ago" (commasF 6 $ cosmicYearsAgo / (1000*1000)))
+            -- , (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
+            , (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer)))
+            ])
+    ])
+    <=>
+    (borderWithLabel (str progressLabel) $
+        updateAttrMap
+        (A.mapAttrName yDoneAttr P.progressCompleteAttr .
+          A.mapAttrName yToDoAttr P.progressIncompleteAttr) $
+        progressBar Nothing (realToFrac $ yearElapsed // yearLength))
     <=>
     (hCenter $ str $ printf "\nDay #%d of %d in %d\nSecond #%s of %s in %d"
                   dayNum