From 67cc8ad58d25b66b11a7d522e72bfe7f40691c0d Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Thu, 23 Sep 2010 10:35:43 +0000 Subject: consider block_scale when expanding blocks --- diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 6b1b2b3..e311c01 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1538,11 +1538,11 @@ class TurtleArtWindow(): break blk = blk.connections[0] if blk.connections[1].name == 'myfunc2arg': - dy = 40 + blk.connections[1].ey - blk.ey + dy = 20 * self.block_scale + blk.connections[1].ey - blk.ey elif blk.connections[1].name == 'myfunc3arg': - dy = 60 + blk.connections[1].ey - blk.ey + dy = 30 * self.block_scale + blk.connections[1].ey - blk.ey else: - dy = 20 + blk.connections[1].ey - blk.ey + dy = 10 * self.block_scale + blk.connections[1].ey - blk.ey blk.expand_in_y(dy) if dy != 0: group = find_group(blk.connections[1]) @@ -1650,11 +1650,14 @@ class TurtleArtWindow(): if (selected_block.name in EXPANDABLE_BLOCKS or selected_block.name in NUMBER_STYLE_VAR_ARG): if selected_block.name == 'myfunc2arg': - dy = 40 + selected_block.ey - best_destination.ey + dy = 20 * self.block_scale + selected_block.ey - \ + best_destination.ey elif selected_block.name == 'myfunc3arg': - dy = 60 + selected_block.ey - best_destination.ey + dy = 30 * self.block_scale + selected_block.ey - \ + best_destination.ey else: - dy = 20 + selected_block.ey - best_destination.ey + dy = 10 * self.block_scale + selected_block.ey - \ + best_destination.ey best_destination.expand_in_y(dy) else: if best_destination.ey > 0: -- cgit v0.9.1