diff options
author | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
---|---|---|
committer | Walter Bender <walter.bender@gmail.com> | 2011-11-08 00:12:29 (GMT) |
commit | 4739976d0a96eb21b8f606c69ecc09ca7a1557de (patch) | |
tree | 57170dde71aee01aac39059ebd300a3e5aa9e7e3 /TurtleArt/tablock.py | |
parent | b81f399d5c57465e95cca0fac241975bc75df303 (diff) | |
parent | a7a87c7fa872418f8db1af7badd4c91e0481c2af (diff) |
Merge commit 'refs/merge-requests/3' of git://git.sugarlabs.org/turtleart/mainline into integration
Conflicts:
NEWS
activity/activity.info
Diffstat (limited to 'TurtleArt/tablock.py')
-rw-r--r-- | TurtleArt/tablock.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index d2292b1..03ddc05 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -280,7 +280,7 @@ class Block: self._set_label_attributes() self.svg.set_scale(self.scale) self.refresh() - self.spr.draw() + self.spr.inval() def refresh(self): if self.spr is None: @@ -381,8 +381,9 @@ class Block: self.width = copy_block.width self.height = copy_block.height self.shapes[0] = copy_block.shapes[0] - self.spr = sprites.Sprite(sprite_list, x, y, self.shapes[0]) - self.spr._margins = copy_block.spr._margins[:] + if sprite_list is not None: + self.spr = sprites.Sprite(sprite_list, x, y, self.shapes[0]) + self.spr._margins = copy_block.spr._margins[:] if len(copy_block.shapes) > 1: self.shapes[1] = copy_block.shapes[1] self.docks = copy_block.docks[:] @@ -414,15 +415,19 @@ class Block: for i, n in enumerate(block_names[self.name]): self._set_labels(i, n) - if copy_block is None: + if copy_block is None and self.spr is not None: if self.spr.label_width() > self.spr.label_safe_width(): self.resize() def _set_margins(self): + if self.spr is None: + return self.spr.set_margins(self.svg.margins[0], self.svg.margins[1], self.svg.margins[2], self.svg.margins[3]) def _set_label_attributes(self): + if self.spr is None: + return if self.name in content_blocks: n = len(self.values) if n == 0: @@ -451,6 +456,8 @@ class Block: True, 'center', 'middle', i) def _set_labels(self, i, label): + if self.spr is None: + return self.spr.set_label(label, i) def _make_block(self, svg): |