diff options
author | Walter Bender <walter.bender@gmail.com> | 2013-02-28 17:30:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2013-02-28 17:30:29 (GMT) |
commit | ccbce872af9f9e042811035c3681dd225a89f678 (patch) | |
tree | bb99d7e3d00a581ef531739458fbb7690558f16c /TurtleArt | |
parent | cabc4e32f1559efd82c1a52e0f8c3db9255fb6f5 (diff) |
recommitting many changes in support of touch and rotation
Diffstat (limited to 'TurtleArt')
-rwxr-xr-x | TurtleArt/tasprite_factory.py | 19 | ||||
-rw-r--r-- | TurtleArt/tawindow.py | 19 |
2 files changed, 25 insertions, 13 deletions
diff --git a/TurtleArt/tasprite_factory.py b/TurtleArt/tasprite_factory.py index 3278e8a..a860e5b 100755 --- a/TurtleArt/tasprite_factory.py +++ b/TurtleArt/tasprite_factory.py @@ -998,11 +998,16 @@ class SVG: svg = "</g>/n<g>/n" if noscale: scale = 2.0 - scale2 = 1.0 x = self._hide_x * scale y = self._hide_y * scale - r = self._dot_radius - y2 = y - 1.5 + r = self._dot_radius * 2 + scale = 5 + scale2 = 2 + y2 = y - 10 + svg += self._circle(r, x - r / 2, y - r / 2) + self._fill, self._stroke = HIDE_WHITE, HIDE_WHITE + svg += self._rect(10 * scale2, scale, x - 9 * scale2, y2) + self._fill, self._stroke = _saved_fill, _saved_stroke else: scale = self._scale * 1.75 scale2 = scale / 2 @@ -1010,10 +1015,10 @@ class SVG: y = self._hide_y * self._scale r = self._dot_radius * scale2 y2 = y - scale2 - svg += self._circle(r, x, y) - self._fill, self._stroke = HIDE_WHITE, HIDE_WHITE - svg += self._rect(10 * scale2, scale, x - 5 * scale2, y2) - self._fill, self._stroke = _saved_fill, _saved_stroke + svg += self._circle(r, x, y) + self._fill, self._stroke = HIDE_WHITE, HIDE_WHITE + svg += self._rect(10 * scale2, scale, x - 5 * scale2, y2) + self._fill, self._stroke = _saved_fill, _saved_stroke return svg def _show_dot(self): diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 56bc960..e842e41 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1173,29 +1173,32 @@ class TurtleArtWindow(): def _layout_palette(self, n, regenerate=False, show=True): ''' Layout prototypes in a palette. ''' + BUTTON_SIZE = 32 + MARGIN = 5 if n is not None: if self.orientation == HORIZONTAL_PALETTE: - x, y = 20, self.toolbar_offset + 5 + x, y = BUTTON_SIZE, self.toolbar_offset + MARGIN x, y, max_w = self._horizontal_layout(x, y, self.palettes[n]) if n == palette_names.index('trash'): x, y, max_w = self._horizontal_layout(x + max_w, y, self.trash_stack) - w = x + max_w + 25 + w = x + max_w + BUTTON_SIZE + MARGIN self._make_palette_spr(n, 0, self.toolbar_offset, w, PALETTE_HEIGHT, regenerate) if show: - self.palette_button[2].move((w - 20, self.toolbar_offset)) + self.palette_button[2].move( + (w - BUTTON_SIZE, self.toolbar_offset)) else: - x, y = 5, self.toolbar_offset + 15 + x, y = MARGIN, self.toolbar_offset + BUTTON_SIZE + MARGIN x, y, max_h = self._vertical_layout(x, y, self.palettes[n]) if n == palette_names.index('trash'): x, y, max_h = self._vertical_layout(x, y + max_h, self.trash_stack) - h = y + max_h + 25 - self.toolbar_offset + h = y + max_h + BUTTON_SIZE + MARGIN - self.toolbar_offset self._make_palette_spr(n, 0, self.toolbar_offset, PALETTE_WIDTH, h, regenerate) if show: - self.palette_button[2].move((PALETTE_WIDTH - 20, + self.palette_button[2].move((PALETTE_WIDTH - BUTTON_SIZE, self.toolbar_offset)) if show: self.palette_button[2].save_xy = \ @@ -1350,6 +1353,8 @@ before making changes to your Turtle Blocks program')) self._put_in_trash(b1) else: self._put_in_trash(find_top_block(b)) + self.show_toolbar_palette(palette_names.index('trash'), + regenerate=True) elif blk.name in MACROS: self.new_macro(blk.name, x + 20, y + 20) else: @@ -1797,6 +1802,7 @@ before making changes to your Turtle Blocks program')) blk.type = 'deleted' blk.spr.hide() self.trash_stack = [] + self.show_toolbar_palette(palette_names.index('trash'), regenerate=True) def _in_the_trash(self, x, y): ''' Is x, y over a palette? ''' @@ -2375,6 +2381,7 @@ before making changes to your Turtle Blocks program')) self.selected_turtle = None if self.active_turtle is None: self.canvas.set_turtle(self.default_turtle_name) + self._coordinate_counter = 0 return # If we don't have a group of blocks, then there is nothing to do. |