Przeglądaj źródła

wxGUI: use system colours for dark mode support (#751)

nilason 4 lat temu
rodzic
commit
40ba0304f5

+ 2 - 1
gui/wxpython/gui_core/treeview.py

@@ -196,7 +196,8 @@ class CTreeView(AbstractTreeViewMixin, CustomTreeCtrl):
             kw[style] = CT.TR_HIDE_ROOT | CT.TR_FULL_ROW_HIGHLIGHT |\
             kw[style] = CT.TR_HIDE_ROOT | CT.TR_FULL_ROW_HIGHLIGHT |\
                 CT.TR_HAS_BUTTONS | CT.TR_LINES_AT_ROOT | CT.TR_SINGLE
                 CT.TR_HAS_BUTTONS | CT.TR_LINES_AT_ROOT | CT.TR_SINGLE
         super(CTreeView, self).__init__(parent=parent, model=model, **kw)
         super(CTreeView, self).__init__(parent=parent, model=model, **kw)
-        self.SetBackgroundColour("white")
+        self.SetBackgroundColour(
+            wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW))
         self.RefreshItems()
         self.RefreshItems()
 
 
 
 

+ 2 - 1
gui/wxpython/lmgr/layertree.py

@@ -176,7 +176,8 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
                 style=ctstyle,
                 style=ctstyle,
                 **kwargs)
                 **kwargs)
         self.SetName("LayerTree")
         self.SetName("LayerTree")
-        self.SetBackgroundColour("white")
+        self.SetBackgroundColour(
+            wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW))
 
 
         # SetAutoLayout() causes that no vertical scrollbar is displayed
         # SetAutoLayout() causes that no vertical scrollbar is displayed
         # when some layers are not visible in layer tree
         # when some layers are not visible in layer tree

+ 2 - 15
gui/wxpython/location_wizard/wizard.py

@@ -600,13 +600,8 @@ class ItemList(ListCtrl,
         for column in columns:
         for column in columns:
             self.InsertColumn(i, column)
             self.InsertColumn(i, column)
             i += 1
             i += 1
-        #
-        # add some attributes
-        #
-        self.attr1 = wx.ListItemAttr()
-        self.attr1.SetBackgroundColour(wx.Colour(238, 238, 238))
-        self.attr2 = wx.ListItemAttr()
-        self.attr2.SetBackgroundColour("white")
+        
+        self.EnableAlternateRowColours()
 
 
         if self.sourceData:
         if self.sourceData:
             self.Populate()
             self.Populate()
@@ -706,14 +701,6 @@ class ItemList(ListCtrl,
     def OnGetItemImage(self, item):
     def OnGetItemImage(self, item):
         return -1
         return -1
 
 
-    def OnGetItemAttr(self, item):
-        """Get item attributes"""
-        index = self.itemIndexMap[item]
-        if (index % 2) == 0:
-            return self.attr2
-        else:
-            return self.attr1
-
     def SortItems(self, sorter=cmp):
     def SortItems(self, sorter=cmp):
         """Sort items"""
         """Sort items"""
         items = list(self.itemDataMap.keys())
         items = list(self.itemDataMap.keys())