From c075ebf5a45559c5131240e300b00ab6e39d146b Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Thu, 23 Sep 2010 14:12:28 +0000
Subject: pen up when setting xy

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 97c3325..4da1afc 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -1063,7 +1063,9 @@ class LogoCode:
         x = self.tw.canvas.xcor/self.tw.coord_scale
         y = self.tw.canvas.ycor/self.tw.coord_scale
         for s in sarray:
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(s)
             y -= int(self.tw.canvas.textsize*self.tw.lead)
 
@@ -1250,7 +1252,9 @@ class LogoCode:
         xo = self.tw.calc_position('t1x1')[2]
         x = -(self.tw.canvas.width/2)+xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1265,11 +1269,15 @@ class LogoCode:
         # render media object
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media)
         if self.tw.running_sugar:
             x = 0
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media.replace("media_","descr_"))
         # restore text size
         self.tw.canvas.settextsize(save_text_size)
@@ -1279,7 +1287,9 @@ class LogoCode:
         xo = self.tw.calc_position('t2x1')[2]
         x = -(self.tw.canvas.width/2)+xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1294,17 +1304,25 @@ class LogoCode:
         # render four quadrents
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media1)
         x = 0
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media2)
         y = -self.title_height
         if self.tw.running_sugar:
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media2.replace("media_","descr_"))
             x = -(self.tw.canvas.width/2) + xo
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media1.replace("media_","descr_"))
         # restore text size
         self.tw.canvas.settextsize(save_text_size)
@@ -1314,7 +1332,9 @@ class LogoCode:
         xo = self.tw.calc_position('bullet')[2]
         x = -(self.tw.canvas.width/2) + xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1325,7 +1345,9 @@ class LogoCode:
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
         for s in sarray[1:]:
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(s)
             y -= int(self.bullet_height*2*self.tw.lead)
         # restore text size
@@ -1336,7 +1358,9 @@ class LogoCode:
         xo = self.tw.calc_position('t1x2')[2]
         x = -(self.tw.canvas.width/2) + xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1351,17 +1375,25 @@ class LogoCode:
         # render four quadrents
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media1)
         if self.tw.running_sugar:
             x = 0
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media1.replace("media_","descr_"))
             y = -self.title_height
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media2.replace("media_","descr_"))
             x = -(self.tw.canvas.width/2) + xo
+            self.tw.canvas.setpen(False)
             self.tw.canvas.setxy(x, y)
+            self.tw.canvas.setpen(True)
             self.show(media2)
         # restore text size
         self.tw.canvas.settextsize(save_text_size)
@@ -1371,7 +1403,9 @@ class LogoCode:
         xo = self.tw.calc_position('t2x2')[2]
         x = -(self.tw.canvas.width/2) + xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1386,16 +1420,24 @@ class LogoCode:
         # render four quadrents
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media1)
         x = 0
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media2)
         y = -self.title_height
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media4)
         x = -(self.tw.canvas.width/2) + xo
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media3)
         # restore text size
         self.tw.canvas.settextsize(save_text_size)
@@ -1405,7 +1447,9 @@ class LogoCode:
         xo = self.tw.calc_position('t1x1a')[2]
         x = -(self.tw.canvas.width/2) + xo
         y = self.tw.canvas.height/2
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         # save the text size so we can restore it later
         save_text_size = self.tw.canvas.textsize
         # set title text
@@ -1420,7 +1464,9 @@ class LogoCode:
         # render media object
         # leave some space below the title
         y -= int(self.title_height*2*self.tw.lead)
+        self.tw.canvas.setpen(False)
         self.tw.canvas.setxy(x, y)
+        self.tw.canvas.setpen(True)
         self.show(media1)
         # restore text size
         self.tw.canvas.settextsize(save_text_size)
--
cgit v0.9.1