Merge with 3.4 Issue #22628

This commit is contained in:
Terry Jan Reedy 2014-10-16 23:13:21 -04:00
commit ba2f07df09
1 changed files with 4 additions and 3 deletions

View File

@ -173,11 +173,12 @@ class TreeNode:
def draw(self, x, y):
# XXX This hard-codes too many geometry constants!
dy = 20
self.x, self.y = x, y
self.drawicon()
self.drawtext()
if self.state != 'expanded':
return y+17
return y + dy
# draw children
if not self.children:
sublist = self.item._GetSubList()
@ -188,7 +189,7 @@ class TreeNode:
child = self.__class__(self.canvas, self, item)
self.children.append(child)
cx = x+20
cy = y+17
cy = y + dy
cylast = 0
for child in self.children:
cylast = cy
@ -227,7 +228,7 @@ class TreeNode:
def drawtext(self):
textx = self.x+20-1
texty = self.y-1
texty = self.y-4
labeltext = self.item.GetLabelText()
if labeltext:
id = self.canvas.create_text(textx, texty, anchor="nw",