From 1f1b26b61ebd87927aa5aa00bcaec8711d9e0103 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sun, 31 Oct 2010 13:18:54 +0200 Subject: [PATCH 1/2] Some minor fixes for highlight stuff --- gui/shipBrowser.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index fc17e4030..d60f6b8cb 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -819,9 +819,9 @@ class CategoryItem(wx.Window): r.left = 0 r.height = r.height / 2 if self.highlighted: - mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) - mdc.Clear() - mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) +# mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) +# mdc.Clear() +# mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) sr = 221 sg = 221 @@ -832,7 +832,7 @@ class CategoryItem(wx.Window): mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.SOUTH) r.top = r.height mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.NORTH) - mdc.SetTextForeground(wx.BLACK) + mdc.SetTextForeground(wx.SystemSettings.GetColour( wx.SYS_COLOUR_WINDOWTEXT )) else: mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))) @@ -1064,9 +1064,9 @@ class ShipItem(wx.Window): r.left = 0 r.height = r.height / 2 if self.highlighted: - mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) - mdc.Clear() - mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) +# mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) +# mdc.Clear() +# mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) sr = 221 sg = 221 @@ -1077,7 +1077,7 @@ class ShipItem(wx.Window): mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.SOUTH) r.top = r.height mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.NORTH) - mdc.SetTextForeground(wx.BLACK) + mdc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) else: mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))) @@ -1371,7 +1371,7 @@ class FitItem(wx.Window): if self.highlighted: mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))) mdc.Clear() - mdc.SetTextForeground(wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) + mdc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)) sr = 221 sg = 221 @@ -1382,19 +1382,17 @@ class FitItem(wx.Window): mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.SOUTH) r.top = r.height mdc.GradientFillLinear(r,startColor,wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW),wx.NORTH) - mdc.SetTextForeground(wx.BLACK) - else: activeFitID = self.mainFrame.getActiveFit() if activeFitID == self.fitID: bkR,bkG,bkB = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW) if (bkR+bkG+bkB) >(127+127+127): - scale = 0.90 + scale = -0x33 else: - scale = 1.1 - bkR *= scale - bkG *= scale - bkB *= scale + scale = 0x33 + bkR += scale + bkG += scale + bkB += scale mdc.SetBackground(wx.Brush((bkR,bkG,bkB))) else: mdc.SetBackground(wx.Brush(wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOW))) From 58934f1069c3fec32e64334e1b523c32c5e85c1f Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Sun, 31 Oct 2010 13:24:10 +0200 Subject: [PATCH 2/2] updated eos --- eos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos b/eos index 7bdf630a9..592c9e046 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 7bdf630a918ae5b5380d41ffb35277d6b68e0131 +Subproject commit 592c9e046a8f08a537c14fa965527600312a176a