From bac6361d0bde81dc0ae103ec19b0084c05fb3536 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 19:59:48 +0200 Subject: [PATCH 1/6] Use a bigger font size for GroupItem in case of wxMAC --- gui/shipBrowser.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index fd36e47c0..45721282b 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -944,7 +944,10 @@ class CategoryItem(wx.Window): mdc.Clear() mdc.DrawBitmap(self.shipBmp,5+(rect.height-self.shipBmp.GetHeight())/2,(rect.height-self.shipBmp.GetWidth())/2,0) - mdc.SetFont(wx.Font(8, wx.SWISS, wx.NORMAL, wx.NORMAL, False)) + fontSize = 8 + if 'wxMAC' in wx.PlatformInfo: + fontSize = 9 + mdc.SetFont(wx.Font(9, wx.SWISS, wx.NORMAL, wx.NORMAL, False)) From 425c97f4766458bebbd679e26ad53c6fdd8aa2fd Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 20:03:16 +0200 Subject: [PATCH 2/6] Inc fontsize for wxmac --- gui/shipBrowser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 45721282b..698584a79 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -946,8 +946,8 @@ class CategoryItem(wx.Window): mdc.DrawBitmap(self.shipBmp,5+(rect.height-self.shipBmp.GetHeight())/2,(rect.height-self.shipBmp.GetWidth())/2,0) fontSize = 8 if 'wxMAC' in wx.PlatformInfo: - fontSize = 9 - mdc.SetFont(wx.Font(9, wx.SWISS, wx.NORMAL, wx.NORMAL, False)) + fontSize = 10 + mdc.SetFont(wx.Font(fontSize, wx.SWISS, wx.NORMAL, wx.NORMAL, False)) From e88d54576ef51e0129229437bdefc37565e71ba4 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 20:11:12 +0200 Subject: [PATCH 3/6] Properly set size for dnd window --- gui/shipBrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 698584a79..87606eb74 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -1288,8 +1288,8 @@ class PFBitmapFrame(wx.Frame): self.direction = 1 self.transp = 0 self.SetRoundShape() + self.SetSize((bitmap.GetWidth(),bitmap.GetHeight())) self.Refresh() - self.Update() def OnTimer(self, event): self.transp += 20*self.direction From 0019ea2cca60689e79df5e0d2d55b1f48bd54e6c Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 20:16:40 +0200 Subject: [PATCH 4/6] Random tryouts to make thing works on wxmac, I wonder why? --- gui/shipBrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 87606eb74..1114ca8ab 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -1287,8 +1287,8 @@ class PFBitmapFrame(wx.Frame): self.timer = wx.Timer(self,wx.ID_ANY) self.direction = 1 self.transp = 0 - self.SetRoundShape() self.SetSize((bitmap.GetWidth(),bitmap.GetHeight())) + self.SetRoundShape() self.Refresh() def OnTimer(self, event): From 6b99d8e717346f8ffd216c97ca8a739ac75e1528 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 20:30:01 +0200 Subject: [PATCH 5/6] Use window.SetShape only on wxmsw --- gui/shipBrowser.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 1114ca8ab..76257f3a4 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -1288,7 +1288,10 @@ class PFBitmapFrame(wx.Frame): self.direction = 1 self.transp = 0 self.SetSize((bitmap.GetWidth(),bitmap.GetHeight())) - self.SetRoundShape() + if 'wxMSW' in wx.PlatformInfo: + self.SetRoundShape() + else: + self.SetTransparent(0) self.Refresh() def OnTimer(self, event): From 2f2373180c3f6552c0669d349bc16a483066acbf Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Tue, 9 Nov 2010 21:11:51 +0200 Subject: [PATCH 6/6] Padded splitter window (left +2) --- gui/mainFrame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 002c6da23..ff6832a23 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -73,7 +73,7 @@ class MainFrame(wx.Frame): self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE) - mainSizer.Add(self.splitter,1,wx.EXPAND) + mainSizer.Add(self.splitter,1,wx.EXPAND | wx.LEFT, 2) self.FitviewAdditionsPanel = PFPanel(self.splitter) faSizer = wx.BoxSizer(wx.VERTICAL)