--- a/Cairo__ClockView.st	Wed Dec 24 22:29:13 2014 +0100
+++ b/Cairo__ClockView.st	Wed Dec 24 23:59:59 2014 +0100
@@ -52,30 +52,31 @@
 
 redraw
 
-    | time hours mins secs |
+    | image image_cr time hours mins secs |
 
     self clippingRectangle: 
         (Smalltalk::Rectangle left:1 top:1 width:self width height:self height).
     cr isNil ifTrue:[
         cr := self cairo.
     ].
+    image_cr := Cairo::GraphicsContext on: (image := Cairo::Surface forImageFormatARGB32width: self width  height: self height). 
 
     "/ scale to unit square and translate (0, 0) to be (0.5, 0.5), i.e.
     "/ the center of the window
-    cr save.
-    cr scale: self extent.
-    cr translate: (0.5 @ 0.5).
-    cr lineWidth: 0.05.
+    image_cr save.
+    image_cr scale: self extent.
+    image_cr translate: (0.5 @ 0.5).
+    image_cr lineWidth: 0.05.
 
-    cr paint: (Color red: 33 green: 61 blue: 11).
-    cr paint.
+    image_cr paint: (Color red: 33 green: 61 blue: 11).
+    image_cr paint.
 
-    cr arcX: 0 y: 0 radius: 0.42 from: 0 to: (2 * (Float pi)).
-    cr paint: Color white.
-    cr fillAndPreserve.
-    cr paint: Color black.
-    cr strokeAndPreserve.
-    cr clip.
+    image_cr arcX: 0 y: 0 radius: 0.42 from: 0 to: (2 * (Float pi)).
+    image_cr paint: Color white.
+    image_cr fillAndPreserve.
+    image_cr paint: Color black.
+    image_cr strokeAndPreserve.
+    image_cr clip.
 
     "Now, clock ticks"
 
@@ -83,23 +84,23 @@
         | inset |
 
         inset := 0.05.
-        cr save.
+        image_cr save.
 
-        cr lineCap: Cairo::LineCap LINE_CAP_ROUND.
+        image_cr lineCap: Cairo::LineCap LINE_CAP_ROUND.
         (i \\ 3) ~~ 0 ifTrue:[
             inset := inset * 0.8.
-            cr lineWidth: 0.03.
+            image_cr lineWidth: 0.03.
         ].
 
-        cr moveToX: (0.42 - inset) * ( i * (Float pi / 6)) cos
+        image_cr moveToX: (0.42 - inset) * ( i * (Float pi / 6)) cos
                  y: (0.42 - inset) * ( i * (Float pi / 6)) sin.
 
-        cr lineToX: (0.42 ) * ( i * (Float pi / 6)) cos
+        image_cr lineToX: (0.42 ) * ( i * (Float pi / 6)) cos
                  y: (0.42 ) * ( i * (Float pi / 6)) sin.
 
-        cr stroke.
+        image_cr stroke.
 
-        cr restore.
+        image_cr restore.
     ].
 
     "/ Not, the current time"
@@ -110,45 +111,49 @@
     mins := time minutes * (Float pi / 30).
     secs := time seconds * (Float pi / 30).
 
-    cr save.
-    cr lineCap: Cairo::LineCap LINE_CAP_ROUND.
+    image_cr save.
+    image_cr lineCap: Cairo::LineCap LINE_CAP_ROUND.
 
     "/ draw the seconds hand
-    cr save.
-    cr lineWidth: 0.016.
-    cr paint: ((Color red: 70 green: 70 blue: 70) alpha: 0.8).
-    cr moveToX: 0.0 y: 0.0.
-    cr lineToX: (secs sin * (0.42 * 0.9))
+    image_cr save.
+    image_cr lineWidth: 0.016.
+    image_cr paint: ((Color red: 70 green: 70 blue: 70) alpha: 0.8).
+    image_cr moveToX: 0.0 y: 0.0.
+    image_cr lineToX: (secs sin * (0.42 * 0.9))
              y: (-1 *  (secs cos * (0.42 * 0.9))).
-    cr stroke.
-    cr restore.
+    image_cr stroke.
+    image_cr restore.
 
     "/ draw th minutes
-    cr paint: ((Color red: 11 green: 33 blue: 61) alpha: 0.7).
-    cr moveToX: 0.0 y: 0.0.
-    cr lineToX: ((mins + (secs / 60)) sin * (0.42 * 0.8))
+    image_cr paint: ((Color red: 11 green: 33 blue: 61) alpha: 0.7).
+    image_cr moveToX: 0.0 y: 0.0.
+    image_cr lineToX: ((mins + (secs / 60)) sin * (0.42 * 0.8))
              y: (-1 * ((mins + (secs / 60)) cos * (0.42 * 0.8))).
-    cr stroke.
+    image_cr stroke.
 
     "/ draw the hours hand
-    cr paint: ((Color red: 33 green: 61 blue: 11) alpha: 0.6).
-    cr moveToX: 0.0 y: 0.0.
-    cr lineToX: ((hours + (mins / 12)) sin * (0.42 * 0.5))
+    image_cr paint: ((Color red: 33 green: 61 blue: 11) alpha: 0.6).
+    image_cr moveToX: 0.0 y: 0.0.
+    image_cr lineToX: ((hours + (mins / 12)) sin * (0.42 * 0.5))
              y: (-1 * ((hours + (mins / 12)) cos * (0.42 * 0.5))).
-    cr stroke.
+    image_cr stroke.
 
 
-    cr restore.
-    cr arcX: 0 y: 0 radius: 0.01 from: 0 to: (2 * (Float pi)).
-    cr fill.
+    image_cr restore.
+    image_cr arcX: 0 y: 0 radius: 0.01 from: 0 to: (2 * (Float pi)).
+    image_cr fill.
 
 
 
 
 
-    cr restore.
+    image_cr restore.
+
+    cr setSourceSurface: image. 
+    cr paint.
 
     "Created: / 16-06-2012 / 23:25:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 24-12-2014 / 23:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 redrawX: x y: y width: w height: h
@@ -163,3 +168,4 @@
 version_HG
     ^ '$Changeset: <not expanded> $'
 ! !
+