diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-07-26 23:55:08 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2011-07-26 23:55:08 (GMT) |
| commit | 89bbee444f5701f40dd1cc2c5affd40c8b106421 (patch) | |
| tree | e80fef38db50069e2da838a8972549d97c0e7ef1 /TurtleArt | |
| parent | 0f7a93ac38791b4f1bcc728329d0eea797d550a9 (diff) | |
cleaned up skin sizing code
Diffstat (limited to 'TurtleArt')
| -rw-r--r-- | TurtleArt/taconstants.py | 2 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py index e40b3ca..b39c1b7 100644 --- a/TurtleArt/taconstants.py +++ b/TurtleArt/taconstants.py @@ -137,6 +137,8 @@ MEDIA_SHAPES = [] NO_IMPORT = [] +EXPAND_SKIN = {} + OVERLAY_SHAPES = ['Cartesian', 'Cartesian_labeled', 'polar', 'metric'] STATUS_SHAPES = ['status', 'info', 'nostack', 'dupstack', 'noinput', diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index cbf8eb3..294fb57 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -57,7 +57,8 @@ from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \ MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \ CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \ TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \ - EXPANDABLE_ARGS, XO1, XO15, UNKNOWN, TITLEXY, CONTENT_ARGS, CONSTANTS + EXPANDABLE_ARGS, XO1, XO15, UNKNOWN, TITLEXY, CONTENT_ARGS, CONSTANTS, \ + EXPAND_SKIN from tapalette import palette_names, palette_blocks, expandable_blocks, \ block_names, content_blocks, default_values, special_names, block_styles, \ help_strings @@ -2623,9 +2624,10 @@ class TurtleArtWindow(): elif btype in block_styles['box-style-media'] and blk.spr is not None: if len(blk.values) == 0 or blk.values[0] == 'None' or \ blk.values[0] is None or btype in NO_IMPORT: + if btype in EXPAND_SKIN: + blk.expand_in_x(EXPAND_SKIN[btype]) self._block_skin(btype + 'off', blk) - elif btype == 'video' or btype == 'audio' or \ - btype == 'description': + elif btype in ['video', 'audio', 'description']: self._block_skin(btype + 'on', blk) elif self.running_sugar: try: @@ -2953,8 +2955,10 @@ class TurtleArtWindow(): w, h = self._calc_w_h('journaloff', blk.spr) x, y = self._calc_image_offset('journaloff', blk.spr, w, h) else: - w, h = self._calc_w_h('descriptionoff', blk.spr) - x, y = self._calc_image_offset('descriptionoff', blk.spr, w, h) + # w, h = self._calc_w_h('descriptionoff', blk.spr) + w, h = self._calc_w_h('', blk.spr) + # x, y = self._calc_image_offset('descriptionoff', blk.spr, w, h) + x, y = self._calc_image_offset('', blk.spr, w, h) blk.scale_image(x, y, w, h) |