dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Do not set column image if there's none

Browse Source
This commit is contained in:
DarkPhoenix
2019-07-07 17:27:37 +03:00
parent efd8a6964e
commit 522de5ca5a
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gui/display.py
View File

@@ -89,8 +89,9 @@ class Display(wx.ListCtrl):
def addColumn(self, i, col):
self.activeColumns.append(col)
info = wx.ListItem()
info.SetMask(col.mask | wx.LIST_MASK_FORMAT | wx.LIST_MASK_WIDTH)
info.SetImage(col.imageId)
info.SetMask(col.mask | wx.LIST_MASK_FORMAT)
if col.imageId not in (None, -1):
info.SetImage(col.imageId)
info.SetText(col.columnText)
info.SetWidth(-1)
info.SetAlign(wx.LIST_FORMAT_LEFT)
@@ -247,22 +248,17 @@ class Display(wx.ListCtrl):
self.SetItemData(item, id_)
if 'wxMSW' in wx.PlatformInfo:
for i, col in enumerate(self.activeColumns):
if not col.resized:
for i, col in enumerate(self.activeColumns):
if not col.resized:
if col.size == wx.LIST_AUTOSIZE_USEHEADER:
self.SetColumnWidth(i, wx.LIST_AUTOSIZE_USEHEADER)
headerWidth = self.GetColumnWidth(i)
self.SetColumnWidth(i, wx.LIST_AUTOSIZE)
baseWidth = self.GetColumnWidth(i)
if baseWidth < headerWidth:
self.SetColumnWidth(i, headerWidth)
else:
self.SetColumnWidth(i, col.size)
else:
for i, col in enumerate(self.activeColumns):
if not col.resized:
if col.size == wx.LIST_AUTOSIZE_USEHEADER:
self.SetColumnWidth(i, wx.LIST_AUTOSIZE_USEHEADER)
headerWidth = self.GetColumnWidth(i)
self.SetColumnWidth(i, wx.LIST_AUTOSIZE)
baseWidth = self.GetColumnWidth(i)
if baseWidth < headerWidth:
self.SetColumnWidth(i, headerWidth)
else:
self.SetColumnWidth(i, col.size)
def update(self, stuff):
self.populate(stuff)