drop highlight color fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,7 +15,7 @@ COLOUR_COMMENT = 'Blue'
|
|||||||
COLOUR_REF = 'DarkGreen'
|
COLOUR_REF = 'DarkGreen'
|
||||||
COLOUR_HIDDEN = 'Grey'
|
COLOUR_HIDDEN = 'Grey'
|
||||||
COLOUR_HL = 'Red'
|
COLOUR_HL = 'Red'
|
||||||
COLOUR_DT = 'Green'
|
COLOUR_DT = 'DarkGreen'
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
import images
|
import images
|
||||||
@@ -1121,6 +1121,7 @@ class XML_Tree(wx.TreeCtrl):
|
|||||||
# Override to use like single-selection tree
|
# Override to use like single-selection tree
|
||||||
def GetSelection(self):
|
def GetSelection(self):
|
||||||
return self.selection
|
return self.selection
|
||||||
|
|
||||||
def SelectItem(self, item):
|
def SelectItem(self, item):
|
||||||
self.UnselectAll()
|
self.UnselectAll()
|
||||||
self.ChangeSelection(item)
|
self.ChangeSelection(item)
|
||||||
@@ -1341,10 +1342,13 @@ class DropTarget(wx.PyDropTarget):
|
|||||||
if d != wx.DragNone:
|
if d != wx.DragNone:
|
||||||
obj,parent,parentItem,item = other
|
obj,parent,parentItem,item = other
|
||||||
pos, size = g.tree.FindNodePos(parentItem, obj), obj.GetSize()
|
pos, size = g.tree.FindNodePos(parentItem, obj), obj.GetSize()
|
||||||
# Change tree item colour
|
|
||||||
hl = g.testWin.highLightDT
|
hl = g.testWin.highLightDT
|
||||||
if hl and hl.item and hl.item != parentItem:
|
# 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)
|
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 = updateHL(hl, HighLightDTBox, pos, size)
|
||||||
g.testWin.highLightDT.item = parentItem
|
g.testWin.highLightDT.item = parentItem
|
||||||
g.tree.SetItemTextColour(parentItem, COLOUR_DT)
|
g.tree.SetItemTextColour(parentItem, COLOUR_DT)
|
||||||
@@ -1361,6 +1365,7 @@ class DropTarget(wx.PyDropTarget):
|
|||||||
def RemoveHL(self):
|
def RemoveHL(self):
|
||||||
hl = g.testWin.highLightDT
|
hl = g.testWin.highLightDT
|
||||||
if hl:
|
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()
|
hl.Remove()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user