diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-10-19 04:30:57 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-10-19 04:30:57 (GMT) |
commit | 1a04e9c774f54a5778ac64b54c0d9c5df243a9e0 (patch) | |
tree | 441e1f1bcc62fc20f744f1935ce18517127dde6c /TurtleArt | |
parent | e40e8aedf3d58dd630e55dfe1ed006eadb6ca7c2 (diff) | |
parent | cbb33c54fdc5f1372cc71856b7e5947d181d5063 (diff) |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Diffstat (limited to 'TurtleArt')
-rw-r--r-- | TurtleArt/tawindow.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 5612595..5072ab2 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1340,7 +1340,7 @@ class TurtleArtWindow(): for g in find_group(blk): g.spr.move_relative((int(dx), int(dy))) g.spr.save_xy = g.spr.get_xy() - if self.running_sugar: # and not self.hw in [XO1]: + if self.running_sugar and not self.hw in [XO1]: g.spr.move_relative((self.activity.hadj_value, self.activity.vadj_value)) y += int(h + 3) @@ -1378,7 +1378,7 @@ class TurtleArtWindow(): for g in find_group(blk): g.spr.move_relative((dx, dy)) g.spr.save_xy = g.spr.get_xy() - if self.running_sugar: # and not self.hw in [XO1]: + if self.running_sugar and not self.hw in [XO1]: g.spr.move_relative((self.activity.hadj_value, self.activity.vadj_value)) x += int(w + 4) @@ -1432,7 +1432,7 @@ class TurtleArtWindow(): if show: self.palette_button[2].save_xy = \ self.palette_button[2].get_xy() - if self.running_sugar: # and not self.hw in [XO1]: + if self.running_sugar and not self.hw in [XO1]: self.palette_button[2].move_relative( (self.activity.hadj_value, self.activity.vadj_value)) self.palette_sprs[n][self.orientation].set_layer( @@ -1450,7 +1450,7 @@ class TurtleArtWindow(): Sprite(self.sprite_list, x, y, svg_str_to_pixbuf( svg.palette(w, h))) self.palette_sprs[n][self.orientation].save_xy = (x, y) - if self.running_sugar: # and not self.hw in [XO1]: + if self.running_sugar and not self.hw in [XO1]: self.palette_sprs[n][self.orientation].move_relative( (self.activity.hadj_value, self.activity.vadj_value)) if self.orientation == 0 and w > self.width: @@ -1481,6 +1481,8 @@ class TurtleArtWindow(): if self.running_sugar: self._show_unfullscreen_button() + self.activity.hide_store() + # Find out what was clicked spr = self.sprite_list.find_sprite((x, y)) |