From 1ef0ababfe952ec218ac7fa92d234c11f630c238 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 02 Feb 2012 22:00:25 +0000
Subject: fixed problem problem of boolean block not expanding when docked to another boolean

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index dc5054f..cd5bc0b 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1900,7 +1900,7 @@ class TurtleArtWindow():
                 return
 
             if blk.name in block_styles['boolean-style']:
-                self._expand_boolean(blk, blk.connections[1], dy)
+                self._expand_boolean(blk, blk.connections[2], dy)
             else:
                 self._expand_expandable(blk, blk.connections[1], dy)
 
@@ -2141,9 +2141,14 @@ class TurtleArtWindow():
             # Some destination blocks expand to accomodate large blocks
             if best_destination.name in block_styles['boolean-style']:
                 if best_destination_dockn == 2 and \
-                   (selected_block.name in block_styles['compare-style'] or \
+                   (selected_block.name in block_styles['boolean-style'] or \
+                    selected_block.name in block_styles['compare-style'] or \
                     selected_block.name in block_styles['compare-porch-style']):
                     dy = selected_block.ey - best_destination.ey
+                    if selected_block.name in block_styles['boolean-style']:
+                        # Even without expanding, boolean blocks are
+                        # too large to fit in the lower dock position
+                        dy += 45
                     best_destination.expand_in_y(dy)
                     self._expand_boolean(best_destination, selected_block, dy)
             elif best_destination.name in expandable_blocks and \
--
cgit v0.9.1