# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1484660064 -10800
# Node ID 3f86e9768f14bc72d1b0d73adb802ba55328058a
# Parent  6f4624687b8954fba529644d2f4df6aded96702a# Parent  299a1dde6baa7291fc3b4e6f0dd05219fd3cf073
merge

diff -r 299a1dde6baa -r 3f86e9768f14 IDEFrame.py
--- a/IDEFrame.py	Mon Jan 16 01:19:58 2017 +0100
+++ b/IDEFrame.py	Tue Jan 17 16:34:24 2017 +0300
@@ -1491,8 +1491,7 @@
             item_name = _(item_name)
         self.ProjectTree.SetItemText(root, item_name)
         self.ProjectTree.SetPyData(root, infos)
-        highlight_colours = self.Highlights.get(infos.get("tagname", None), (wx.WHITE, wx.BLACK))
-        self.ProjectTree.SetItemBackgroundColour(root, highlight_colours[0])
+        highlight_colours = self.Highlights.get(infos.get("tagname", None), (wx.Colour(255, 255, 255, 0), wx.BLACK))
         self.ProjectTree.SetItemTextColour(root, highlight_colours[1])
         self.ProjectTree.SetItemExtraImage(root, None)
         if infos["type"] == ITEM_POU:
diff -r 299a1dde6baa -r 3f86e9768f14 controls/PouInstanceVariablesPanel.py
--- a/controls/PouInstanceVariablesPanel.py	Mon Jan 16 01:19:58 2017 +0100
+++ b/controls/PouInstanceVariablesPanel.py	Tue Jan 17 16:34:24 2017 +0300
@@ -93,7 +93,7 @@
             images_bbx = self.GetItemRightImagesBBox(item)
             r_image_w, r_image_h = self._imageListRight.GetSize(rightimages[0])
             
-            dc.SetBrush(wx.WHITE_BRUSH)
+            dc.SetBrush(wx.TRANSPARENT_BRUSH)
             dc.SetPen(wx.TRANSPARENT_PEN)
             
             bg_width = (r_image_w + 4) * len(rightimages) + 4
diff -r 299a1dde6baa -r 3f86e9768f14 editors/TextViewer.py
--- a/editors/TextViewer.py	Mon Jan 16 01:19:58 2017 +0100
+++ b/editors/TextViewer.py	Tue Jan 17 16:34:24 2017 +0300
@@ -414,7 +414,7 @@
         self.Colourise(0, -1)
 
     def RefreshJumpList(self):
-        if self.TextSyntax != "IL":
+        if self.TextSyntax == "IL":
             self.Jumps = [jump.upper() for jump in LABEL_MODEL.findall(self.GetText())]
             self.Colourise(0, -1)