diff options
| author | Marion <marion.zepf@gmail.com> | 2013-08-31 16:34:31 (GMT) |
|---|---|---|
| committer | Marion <marion.zepf@gmail.com> | 2013-08-31 16:34:31 (GMT) |
| commit | 8076e1880999823d3c5df393431a419b3f9780c2 (patch) | |
| tree | 2f86165e21b50020b052324c5d8cc117895cae5e /TurtleArt/taturtle.py | |
| parent | d2d0d6a2b5c2e5b2d89eba2044159635ba951a94 (diff) | |
| parent | 624c945534e6a4d1a30d1c6fcfc621b3b27995ab (diff) | |
Merge remote-tracking branch 'mainline/master' into type-system
Diffstat (limited to 'TurtleArt/taturtle.py')
| -rw-r--r-- | TurtleArt/taturtle.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/TurtleArt/taturtle.py b/TurtleArt/taturtle.py index 16820f8..5359c65 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 = [] @@ -396,7 +402,8 @@ class Turtle: if pen_size is not None: self._pen_size = max(0, pen_size) - 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, @@ -530,12 +537,16 @@ class Turtle: int(distance)])) self._turtles.turtle_window.send_event(event) - def set_xy(self, pos, share=True, pendown=True): + def set_xy(self, pos, share=True, pendown=True, dragging=False): old = self.get_xy() try: - xcor = pos[0] * self._turtles.turtle_window.coord_scale - ycor = pos[1] * self._turtles.turtle_window.coord_scale + if dragging: + xcor = pos[0] + ycor = pos[1] + else: + xcor = pos[0] * self._turtles.turtle_window.coord_scale + ycor = pos[1] * self._turtles.turtle_window.coord_scale except (TypeError, ValueError): debug_output('bad value sent to %s' % (__name__), self._turtles.turtle_window.running_sugar) |