From fe5a5552ebb1a2d1fb7930b31c631e23332b108b Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 17 Mar 2011 17:49:12 +0000
Subject: more finetuning of turtle label size and position

---
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 416df3c..a1be5d6 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -131,13 +131,13 @@ class Turtle:
             self.spr = Sprite(turtles.sprite_list, 0, 0, self.shapes[0])
             angle = uniform(0, 6.14)
             w = self.shapes[0].get_width()
-            r = w * 0.75
+            r = w * 0.67
             if angle > 3.14:
-                self.label_xy = [w + int(r * sin(angle) + r / 2.0),
-                                 int(r * cos(angle) + r / 2.0)]
+                self.label_xy = [int(r * sin(angle)),
+                                 int(r * cos(angle) + w / 2.0)]
             else:
-                self.label_xy = [int(r * sin(angle) + r / 2.0),
-                                 int(r * cos(angle) + r / 2.0)]
+                self.label_xy = [int(r * sin(angle) + w / 2.0),
+                                 int(r * cos(angle) + w / 2.0)]
         else:
             self.spr = None
         turtles.add_to_dict(key, self)
@@ -248,7 +248,7 @@ class Turtle:
         if self.label_block is not None:
             self.label_block.spr.move((self.x + self.label_xy[0],
                                        self.y + self.label_xy[1]))
-            self.label_block.spr.set_layer(TURTLE_LAYER)
+            self.label_block.spr.set_layer(TURTLE_LAYER + 1)
 
     def move(self, pos):
         """ Move the turtle. """
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index d2a1970..effaf35 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1573,9 +1573,11 @@ class TurtleArtWindow():
                                        self.sprite_list, 'turtle-label', 0, 0,
                                        'label', [], 1.0 / self.scale,
                                        colors)
-            turtle.label_block.spr.set_label_attributes(4.0 / self.scale,
-                                                        rescale=False)
-            turtle.label_block.spr.set_label(name)
+            turtle.label_block.spr.set_label_attributes(6.0 / self.scale)
+            if len(name) > 5:
+                turtle.label_block.spr.set_label(name[0:3] + '…')
+            else:
+                turtle.label_block.spr.set_label(name)
             turtle.show()
 
     def _move_turtle(self, x, y):
--
cgit v0.9.1