Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2014-02-08 19:38:48 (GMT)
committer Walter Bender <walter@sugarlabs.org>2014-02-08 19:38:48 (GMT)
commit1524bb2dd6109dbae2f8a99daf3b3afa5f01ec27 (patch)
tree2ec0f7a1d1e68c3a412e9045c6bdf67269509d2d
parentb8ea5b4e550eb115415a1f4544605d5c649e2496 (diff)
move utility method to tautils
-rw-r--r--TurtleArt/tapaletteview.py26
-rw-r--r--TurtleArt/tautils.py20
2 files changed, 23 insertions, 23 deletions
diff --git a/TurtleArt/tapaletteview.py b/TurtleArt/tapaletteview.py
index 213ee17..505ad9d 100644
--- a/TurtleArt/tapaletteview.py
+++ b/TurtleArt/tapaletteview.py
@@ -23,7 +23,7 @@ _SKIN_IMAGE = 1
_MARGIN = 5
_BUTTON_SIZE = 32
-from tautils import find_group, debug_output
+from tautils import find_group, debug_output, get_stack_width_and_height
from tablock import Block
from tapalette import (palette_names, palette_blocks, hidden_proto_blocks,
block_styles)
@@ -34,26 +34,6 @@ from tasprite_factory import SVG, svg_str_to_pixbuf
from sprites import Sprite
-def _width_and_height(blk):
- ''' What are the width and height of a stack? '''
- minx = 10000
- miny = 10000
- maxx = -10000
- maxy = -10000
- for gblk in find_group(blk):
- (x, y) = gblk.spr.get_xy()
- w, h = gblk.spr.get_dimensions()
- if x < minx:
- minx = x
- if y < miny:
- miny = y
- if x + w > maxx:
- maxx = x + w
- if y + h > maxy:
- maxy = y + h
- return(maxx - minx, maxy - miny)
-
-
class PaletteView():
''' Palette View class abstraction '''
@@ -337,7 +317,7 @@ class PaletteView():
if not blk.get_visibility():
continue
- w, h = _width_and_height(blk)
+ w, h = get_stack_width_and_height(blk)
if y + h > PALETTE_HEIGHT + offset:
x += int(max_w + 3)
y = offset + 3
@@ -366,7 +346,7 @@ class PaletteView():
if not blk.get_visibility():
continue
- w, h = _width_and_height(blk)
+ w, h = get_stack_width_and_height(blk)
if x + w > PALETTE_WIDTH:
# Recenter row.
dx = int((PALETTE_WIDTH - row_w) / 2)
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 8e37f95..c53d8cc 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -803,6 +803,26 @@ def find_blk_below(blk, namelist):
return None
+def get_stack_width_and_height(blk):
+ ''' What are the width and height of a stack? '''
+ minx = 10000
+ miny = 10000
+ maxx = -10000
+ maxy = -10000
+ for gblk in find_group(blk):
+ (x, y) = gblk.spr.get_xy()
+ w, h = gblk.spr.get_dimensions()
+ if x < minx:
+ minx = x
+ if y < miny:
+ miny = y
+ if x + w > maxx:
+ maxx = x + w
+ if y + h > maxy:
+ maxy = y + h
+ return(maxx - minx, maxy - miny)
+
+
def get_stack_name(blk):
''' Return the name of the action stack that the given block belongs to.
If the top block of this stack is not a stack-defining block, return