From 7ca511839fb108080dc77a4b5b8017a02fdbd81f Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Fri, 29 Oct 2010 19:35:24 +0300 Subject: [PATCH] Revert "Fix: ticket #234" This reverts commit 97253b4ac4def55e98d7ff6b8789e0af0ce8eb27. --- eos | 2 +- gui/display.py | 7 ++++--- gui/shipBrowser.py | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eos b/eos index fc317f1ba..d22af0654 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit fc317f1ba6ba9528bd14f9135ff5bc616c6e1243 +Subproject commit d22af0654d87b34e5b8d0e892a0cad81f075ce1d diff --git a/gui/display.py b/gui/display.py index 0ae17547a..f97d3d591 100644 --- a/gui/display.py +++ b/gui/display.py @@ -118,7 +118,7 @@ class Display(wx.ListCtrl): selection.append(sel) sel = self.GetNextSelected(sel) -# self.Freeze() + self.Freeze() item = -1 for id, st in enumerate(stuff): item = self.GetNextItem(item) @@ -146,8 +146,9 @@ class Display(wx.ListCtrl): for i, col in enumerate(self.activeColumns): if not col.resized: if col.size == wx.LIST_AUTOSIZE: + self.SetColumnWidth(i, wx.LIST_AUTOSIZE_USEHEADER) + headerWidth = self.GetColumnWidth(i) self.SetColumnWidth(i, wx.LIST_AUTOSIZE) - headerWidth = 24 baseWidth = self.GetColumnWidth(i) if baseWidth < headerWidth: self.SetColumnWidth(i, headerWidth) @@ -156,7 +157,7 @@ class Display(wx.ListCtrl): for sel in selection: self.Select(sel) -# self.Thaw() + self.Thaw() def update(self, stuff): self.populate(stuff) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index a8eba375e..49141186f 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -857,9 +857,8 @@ class ShipItem(wx.Window): self.tcFitName.Show(False) if self.highlighted == 1: self.editWasShown = 1 - - self.newToggleBmp = self.newBmp - self.Refresh() + self.newToggleBmp = self.newBmp + self.Refresh() def editCheckEsc(self, event): if event.GetKeyCode() == wx.WXK_ESCAPE: