1 files changed, 28 insertions, 21 deletions
diff --git a/lib/Phi/Widgets/Clock.hs b/lib/Phi/Widgets/Clock.hs
index bee8d39..12906c0 100644
--- a/lib/Phi/Widgets/Clock.hs
+++ b/lib/Phi/Widgets/Clock.hs
@@ -43,7 +43,7 @@ data ClockState = ClockState !ZonedTime deriving (Show, Eq)
 
 data ClockMessage = UpdateTime !ZonedTime deriving (Show, Typeable)
 
-instance Widget Clock ClockState where
+instance Widget Clock ClockState () where
   initWidget (Clock _) phi _ = do
     forkIO $ forever $ do
       time <- getZonedTime
@@ -59,26 +59,33 @@ instance Widget Clock ClockState where
   minSize (Clock config) _ _ _ = clockSize config
   
   render (Clock config) (ClockState time) _ _ w h _ = do
-    let (r, g, b, a) = fontColor config
-        str = formatTime defaultTimeLocale (clockFormat config) time
-    setSourceRGBA r g b a
-    
-    layout <- createLayout ""
-    (_, PangoRectangle _ _ textWidth textHeight) <- liftIO $ do
-      layoutSetMarkup layout str
-      layoutSetAlignment layout AlignCenter
-      layoutSetSpacing layout $ lineSpacing config
-      layoutGetExtents layout
-    
-    let scalef = min 1 ((fromIntegral w)/textWidth)
-    when (scalef < 1) $ do
-      scale scalef scalef
-      updateLayout layout
-    
-    (_, PangoRectangle _ _ textWidth' textHeight') <- liftIO $ layoutGetExtents layout
-    
-    moveTo (((fromIntegral w)/scalef - textWidth')/2) (((fromIntegral h)/scalef - textHeight')/2)
-    showLayout layout
+    surface <- createImageSurface FormatARGB32 w h
+    renderWith surface $ do
+      setOperator OperatorClear
+      paint
+
+      setOperator OperatorOver
+      let (r, g, b, a) = fontColor config
+          str = formatTime defaultTimeLocale (clockFormat config) time
+      setSourceRGBA r g b a
+      
+      layout <- createLayout ""
+      (_, PangoRectangle _ _ textWidth textHeight) <- liftIO $ do
+        layoutSetMarkup layout str
+        layoutSetAlignment layout AlignCenter
+        layoutSetSpacing layout $ lineSpacing config
+        layoutGetExtents layout
+      
+      let scalef = min 1 ((fromIntegral w)/textWidth)
+      when (scalef < 1) $ do
+        scale scalef scalef
+        updateLayout layout
+      
+      (_, PangoRectangle _ _ textWidth' textHeight') <- liftIO $ layoutGetExtents layout
+      
+      moveTo (((fromIntegral w)/scalef - textWidth')/2) (((fromIntegral h)/scalef - textHeight')/2)
+      showLayout layout
+    return [(True, SurfaceSlice 0 surface)]
   
   handleMessage _ priv m = case (fromMessage m) of
     Just (UpdateTime time) -> ClockState time