From dc035469edd63a5a881d74cd5ea3a37cc19931f4 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 25 Jun 2015 15:59:03 -0400 Subject: [PATCH] Fix background color for certain panels under Linux --- gui/characterEditor.py | 7 +++++-- gui/shipBrowser.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 8d617fa33..8d574c154 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -274,6 +274,7 @@ class CharacterEditor(wx.Frame): class SkillTreeView (wx.Panel): def __init__(self, parent): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.TAB_TRAVERSAL) + self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)) pmainSizer = wx.BoxSizer(wx.VERTICAL) @@ -533,6 +534,7 @@ class APIView (wx.Panel): def __init__(self, parent): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.TAB_TRAVERSAL) self.Parent.Parent.Bind(GE.CHAR_CHANGED, self.charChanged) + self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)) self.apiUrlCreatePredefined = u"https://community.eveonline.com/support/api-key/CreatePredefined?accessMask=8" self.apiUrlKeyList = u"https://community.eveonline.com/support/api-key/" @@ -541,9 +543,10 @@ class APIView (wx.Panel): hintSizer = wx.BoxSizer( wx.HORIZONTAL ) hintSizer.AddStretchSpacer() - self.stDisabledTip = wx.StaticText( self, wx.ID_ANY, u"You cannot add API Details for All 0 and All 5 characters. Please select another character or make a new one.", style=wx.ALIGN_CENTER ) + self.stDisabledTip = wx.StaticText( self, wx.ID_ANY, u"You cannot add API Details for All 0 and All 5 characters.\n" + u"Please select another character or make a new one.", style=wx.ALIGN_CENTER ) self.stDisabledTip.Wrap( -1 ) - hintSizer.Add( self.stDisabledTip, 0, wx.TOP | wx.BOTTOM, 15 ) + hintSizer.Add( self.stDisabledTip, 0, wx.TOP | wx.BOTTOM, 10 ) hintSizer.AddStretchSpacer() pmainSizer.Add(hintSizer, 0, wx.EXPAND, 5) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 20552aa55..110feb711 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -939,11 +939,12 @@ class ShipBrowser(wx.Panel): class PFStaticText(wx.Panel): def __init__(self, parent, label=wx.EmptyString): wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size = parent.GetSize()) + self.SetBackgroundColour(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW)) mainSizer = wx.BoxSizer(wx.VERTICAL) text = wx.StaticText( self, wx.ID_ANY, label, wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_CENTRE ) text.Wrap( -1 ) - mainSizer.Add( text, 1, wx.EXPAND|wx.TOP, 10 ) + mainSizer.Add( text, 1, wx.ALL, 10 ) self.SetSizer(mainSizer) self.Layout() def GetType(self):