take coord_scale into account when setting pen size

5 files changed, 28 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index f677c02..1425843 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+188
+
+BUG FIX:
+* Adjust pen size to coordinate scale
+
 187
 
 ENHANCEMENTS:
@@ -7,10 +12,12 @@ ENHANCEMENTS:
 * Save coordinate scale with gconf
 * Make scaled coordinates +-20 instead of +-100
 
-BUG FIX:
+BUG FIXES:
 * Fixed more bugs in SVG save
 * Fixed several bugs in non-interactive mode
 * Fixed problem with erratic Cntl-V (SL #2751)
+* Fixed problem with missing Stop button when malformed block encountered
+  (SL #4522)
 
 186
 
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py
index 64e172e..1ed557c 100644
--- a/TurtleArt/taturtle.py
+++ b/TurtleArt/taturtle.py
@@ -138,7 +138,10 @@ class Turtles:
                 self._active_turtle.set_color(0)
                 self._active_turtle.set_shade(50)
                 self._active_turtle.set_gray(100)
-                self._active_turtle.set_pen_size(5)
+                if self.turtle_window.coord_scale == 1:
+                    self._active_turtle.set_pen_size(5)
+                else:
+                    self._active_turtle.set_pen_size(1)
                 self._active_turtle.reset_shapes()
                 self._active_turtle.set_heading(0.0)
                 self._active_turtle.set_pen_state(False)
@@ -202,7 +205,10 @@ class Turtle:
         self._pen_shade = 50
         self._pen_color = 0
         self._pen_gray = 100
-        self._pen_size = 5
+        if self._turtles.turtle_window.coord_scale == 1:
+            self._pen_size = 5
+        else:
+            self._pen_size = 1
         self._pen_state = True
         self._pen_fill = False
         self._poly_points = []
@@ -422,7 +428,8 @@ class Turtle:
                              self._turtles.turtle_window.running_sugar)
                 return
 
-        self._turtles.turtle_window.canvas.set_pen_size(self._pen_size)
+        self._turtles.turtle_window.canvas.set_pen_size(
+            self._pen_size * self._turtles.turtle_window.coord_scale)
 
         if self._turtles.turtle_window.sharing() and share:
             event = 'w|%s' % (data_to_string([self._turtles.turtle_window.nick,
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 8d0a504..f96d4bd 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -519,6 +519,8 @@ class TurtleArtActivity(activity.Activity):
             default_values['forward'] = [10]
             default_values['back'] = [10]
             default_values['arc'] = [90, 10]
+            default_values['setpensize'] = [1]
+            self.tw.turtles.get_active_turtle().set_pen_size(1)
         else:
             self.tw.coord_scale = 1
             self.rescale_button.set_icon('expand-coordinates')
@@ -526,6 +528,8 @@ class TurtleArtActivity(activity.Activity):
             default_values['forward'] = [100]
             default_values['back'] = [100]
             default_values['arc'] = [90, 100]
+            default_values['setpensize'] = [5]
+            self.tw.turtles.get_active_turtle().set_pen_size(5)
         if HAS_GCONF:
             self.client.set_int(self._COORDINATE_SCALE, self.tw.coord_scale)
         # Given the change in how overlays are handled (v123), there is no way
diff --git a/activity/activity.info b/activity/activity.info
index e9f55f9..d13a4ac 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = TurtleBlocks
-activity_version = 187
+activity_version = 188
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
diff --git a/turtleblocks.py b/turtleblocks.py
index 8bba2ff..796b441 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -583,6 +583,8 @@ Would you like to save before quitting?'))
             default_values['forward'] = [10]
             default_values['back'] = [10]
             default_values['arc'] = [90, 10]
+            default_values['setpensize'] = [1]
+            self.tw.turtles.get_active_turtle().set_pen_size(1)
         else:
             self.tw.coord_scale = 1
             if self.tw.cartesian is True:
@@ -592,8 +594,10 @@ Would you like to save before quitting?'))
             default_values['forward'] = [100]
             default_values['back'] = [100]
             default_values['arc'] = [90, 100]
+            default_values['setpensize'] = [5]
+            self.tw.turtles.get_active_turtle().set_pen_size(5)
         self.client.set_int(self._COORDINATE_SCALE, int(self.tw.coord_scale))
-        
+
     def _do_toggle_hover_help_cb(self, button):
         ''' Toggle hover help on/off '''
         self.tw.no_help = not self.tw.no_help