Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a transparent pen to ensure that the full rect is filled with the bg color, and any previously set pens will not clutter stuff up

Browse Source
This commit is contained in:
Robin Dunn
2019-10-07 16:05:05 -07:00
parent 1cbde7b685
commit 03e8162c75
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wx/lib/agw/hypertreelist.py
View File

@@ -1408,7 +1408,7 @@ class TreeListItem(GenericTreeItem):
# Hidden items are never evaluated.
if self.IsHidden():
return None, flags, wx.NOT_FOUND
# for a hidden root node, don't evaluate it, but do evaluate children
if not theCtrl.HasAGWFlag(wx.TR_HIDE_ROOT) or level > 0:
@@ -2353,7 +2353,7 @@ class TreeListMainWindow(CustomTreeCtrl):
:param `colour`: a valid :class:`wx.Colour` instance.
:param integer `column`
"""
item.SetBackgroundColour(colour, column)
if column == 0:
@@ -2457,7 +2457,7 @@ class TreeListMainWindow(CustomTreeCtrl):
if not self.HasAGWFlag(TR_HIDE_ROOT):
if self.IsVisible(root):
return root
return self.GetNextVisible(root)
@@ -3089,23 +3089,25 @@ class TreeListMainWindow(CustomTreeCtrl):
else:
itemrect = wx.Rect(text_x-2, item.GetY() + off_h, text_w+2*_MARGIN, total_h - off_h)
dc.SetBrush(wx.Brush(colBg))
dc.SetPen(wx.TRANSPARENT_PEN)
dc.DrawRectangle(itemrect)
else:
dc.SetTextForeground(colText)
else:
if self.HasAGWFlag(TR_FILL_WHOLE_COLUMN_BACKGROUND):
itemrect = wx.Rect(text_x-2, item.GetY() + off_h, col_w-2*_MARGIN, total_h - off_h)
else:
itemrect = wx.Rect(text_x-2, item.GetY() + off_h, text_w+2*_MARGIN, total_h - off_h)
itemrect = wx.Rect(text_x-2, item.GetY() + off_h, text_w+2*_MARGIN, total_h - off_h)
colBgX = item.GetBackgroundColour(i)
if colBgX != None and i != 0:
dc.SetBrush(wx.Brush(colBgX, wx.SOLID))
dc.SetPen(wx.TRANSPARENT_PEN)
dc.DrawRectangle(itemrect)
dc.SetTextForeground(colText)
if self.HasAGWFlag(TR_COLUMN_LINES): # vertical lines between columns
@@ -3265,6 +3267,7 @@ class TreeListMainWindow(CustomTreeCtrl):
itemrect = wx.Rect(x_maincol, y-h-1, width, h+1)
dc.SetBrush(wx.Brush(colBg, wx.SOLID))
dc.SetPen(wx.TRANSPARENT_PEN)
dc.DrawRectangle(itemrect)
# draw item
@@ -3951,7 +3954,7 @@ class TreeListMainWindow(CustomTreeCtrl):
# Hidden items have a height of 0.
item.SetHeight(0)
return
attr = item.GetAttributes()
if attr and attr.HasFont():