From b67bca8c6b74c60e276f94fc18b4ce6633a61e98 Mon Sep 17 00:00:00 2001 From: Roman Rolinsky Date: Fri, 27 Apr 2007 20:33:54 +0000 Subject: [PATCH] drop highlight color fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wx/tools/XRCed/tree.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py index d287a1d33a..becfcc423a 100644 --- a/wxPython/wx/tools/XRCed/tree.py +++ b/wxPython/wx/tools/XRCed/tree.py @@ -15,7 +15,7 @@ COLOUR_COMMENT = 'Blue' COLOUR_REF = 'DarkGreen' COLOUR_HIDDEN = 'Grey' COLOUR_HL = 'Red' -COLOUR_DT = 'Green' +COLOUR_DT = 'DarkGreen' # Icons import images @@ -1121,6 +1121,7 @@ class XML_Tree(wx.TreeCtrl): # Override to use like single-selection tree def GetSelection(self): return self.selection + def SelectItem(self, item): self.UnselectAll() self.ChangeSelection(item) @@ -1341,10 +1342,13 @@ class DropTarget(wx.PyDropTarget): if d != wx.DragNone: obj,parent,parentItem,item = other pos, size = g.tree.FindNodePos(parentItem, obj), obj.GetSize() - # Change tree item colour hl = g.testWin.highLightDT - if hl and hl.item and hl.item != parentItem: - g.tree.SetItemTextColour(hl.item, g.tree.itemColour) + # Set color of highlighted item back to normal + if hl and hl.item: + if hl.item != parentItem: + g.tree.SetItemTextColour(hl.item, g.tree.itemColour) + # Highlight future parent + g.tree.itemColour = g.tree.GetItemTextColour(parentItem) # save current g.testWin.highLightDT = updateHL(hl, HighLightDTBox, pos, size) g.testWin.highLightDT.item = parentItem g.tree.SetItemTextColour(parentItem, COLOUR_DT) @@ -1361,6 +1365,7 @@ class DropTarget(wx.PyDropTarget): def RemoveHL(self): hl = g.testWin.highLightDT if hl: - if hl.item: g.tree.SetItemTextColour(hl.item, g.tree.itemColour) + if hl.item: + g.tree.SetItemTextColour(hl.item, g.tree.itemColour) hl.Remove() -- 2.45.2