From 88074c8516e3227cb553fc7e598efdbc9dd43103 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 11 Dec 2014 23:25:44 -0500 Subject: [PATCH] Fix fonts and lag with OS X --- gui/chromeTabs.py | 10 +++++----- gui/pygauge.py | 3 ++- gui/shipBrowser.py | 18 +++++++++--------- gui/utils/fonts.py | 8 ++++++++ 4 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 gui/utils/fonts.py diff --git a/gui/chromeTabs.py b/gui/chromeTabs.py index 91be9ed60..7ea61a2e3 100644 --- a/gui/chromeTabs.py +++ b/gui/chromeTabs.py @@ -22,6 +22,7 @@ import wx.lib.newevent import gui.utils.colorUtils as colorUtils import gui.utils.drawUtils as drawUtils from gui import bitmapLoader +import gui.utils.fonts as fonts _PageChanging, EVT_NOTEBOOK_PAGE_CHANGING = wx.lib.newevent.NewEvent() _PageChanged, EVT_NOTEBOOK_PAGE_CHANGED = wx.lib.newevent.NewEvent() @@ -321,7 +322,7 @@ class PFNotebook(wx.Panel): class PFTabRenderer: - def __init__(self, size=(36, 24), text=wx.EmptyString, img=None, inclination=6 , closeButton=True, fontSize=14): + def __init__(self, size=(36, 24), text=wx.EmptyString, img=None, inclination=6 , closeButton=True): """ Renders a new tab @@ -352,14 +353,13 @@ class PFTabRenderer: self.text = text self.tabSize = (width, height) self.closeButton = closeButton - self.fontSize = fontSize self.selected = False self.closeBtnHovering = False self.tabBitmap = None self.tabBackBitmap = None self.cbSize = 5 self.padding = 4 - self.font = wx.FontFromPixelSize((0, self.fontSize), wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.font = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.tabImg = img self.position = (0, 0) # Not used internally for rendering - helper for tab container @@ -1275,7 +1275,7 @@ class PFNotebookPagePreview(wx.Frame): self.padding = 15 self.transp = 0 - hfont = wx.FontFromPixelSize((0, 14), wx.SWISS, wx.NORMAL, wx.NORMAL, False) + hfont = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.SetFont(hfont) tx, ty = self.GetTextExtent(self.title) @@ -1338,7 +1338,7 @@ class PFNotebookPagePreview(wx.Frame): mdc.SetBackground(wx.Brush(color)) mdc.Clear() - font = wx.FontFromPixelSize((0, 14), wx.SWISS, wx.NORMAL,wx.NORMAL, False) + font = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL,wx.NORMAL, False) mdc.SetFont(font) x,y = mdc.GetTextExtent(self.title) diff --git a/gui/pygauge.py b/gui/pygauge.py index d9f92d5e2..d63332fd9 100644 --- a/gui/pygauge.py +++ b/gui/pygauge.py @@ -18,6 +18,7 @@ import math from gui.utils import colorUtils import gui.utils.drawUtils as drawUtils import gui.utils.animEffects as animEffects +import gui.utils.fonts as fonts class PyGauge(wx.PyWindow): """ @@ -74,7 +75,7 @@ class PyGauge(wx.PyWindow): self._oldPercentage = 0 self._showRemaining = False - self.font = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.font = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL, False) self.SetBarGradient((wx.Colour(119,119,119),wx.Colour(153,153,153))) self.SetBackgroundColour(wx.Colour(51,51,51)) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 06ed53a16..dd2c4c9eb 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -5,7 +5,6 @@ import gui.mainFrame import gui.globalEvents as GE import time from gui.PFListPane import PFListPane -import service from wx.lib.buttons import GenBitmapButton @@ -18,6 +17,7 @@ import gui.sfBrowserItem as SFItem from gui.contextMenu import ContextMenu import service +import gui.utils.fonts as fonts FitRenamed, EVT_FIT_RENAMED = wx.lib.newevent.NewEvent() FitSelected, EVT_FIT_SELECTED = wx.lib.newevent.NewEvent() @@ -354,7 +354,7 @@ class NavigationPanel(SFItem.SFBrowserItem): self.recentSearches = [] self.inSearch = False - self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.fontSmall = wx.Font(fonts.SMALL, wx.SWISS, wx.NORMAL, wx.NORMAL) w,h = size self.BrowserSearchBox = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, (-1, h - 2 if 'wxGTK' in wx.PlatformInfo else -1 ), wx.TE_PROCESS_ENTER | (wx.BORDER_NONE if 'wxGTK' in wx.PlatformInfo else 0)) self.BrowserSearchBox.Show(False) @@ -943,7 +943,7 @@ class CategoryItem(SFItem.SFBrowserItem): self.padding = 4 - self.fontBig = wx.FontFromPixelSize((0,15),wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.fontBig = wx.Font(fonts.BIG, wx.SWISS, wx.NORMAL, wx.NORMAL) self.animTimerId = wx.NewId() @@ -1057,9 +1057,9 @@ class ShipItem(SFItem.SFBrowserItem): self.shipID = shipID - self.fontBig = wx.FontFromPixelSize((0,15),wx.SWISS, wx.NORMAL, wx.BOLD, False) - self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False) - self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.fontBig = wx.Font(fonts.BIG, wx.SWISS, wx.NORMAL, wx.BOLD) + self.fontNormal = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL) + self.fontSmall = wx.Font(fonts.SMALL, wx.SWISS, wx.NORMAL, wx.NORMAL) self.shipBmp = None if shipID: @@ -1445,9 +1445,9 @@ class FitItem(SFItem.SFBrowserItem): self.dragMotionTrigger = self.dragMotionTrail self.dragWindow = None - self.fontBig = wx.FontFromPixelSize((0,15),wx.SWISS, wx.NORMAL, wx.BOLD, False) - self.fontNormal = wx.FontFromPixelSize((0,14),wx.SWISS, wx.NORMAL, wx.NORMAL, False) - self.fontSmall = wx.FontFromPixelSize((0,12),wx.SWISS, wx.NORMAL, wx.NORMAL, False) + self.fontBig = wx.Font(fonts.BIG, wx.SWISS, wx.NORMAL, wx.BOLD) + self.fontNormal = wx.Font(fonts.NORMAL, wx.SWISS, wx.NORMAL, wx.NORMAL) + self.fontSmall = wx.Font(fonts.SMALL, wx.SWISS, wx.NORMAL, wx.NORMAL) self.SetDraggable() diff --git a/gui/utils/fonts.py b/gui/utils/fonts.py new file mode 100644 index 000000000..08f858f21 --- /dev/null +++ b/gui/utils/fonts.py @@ -0,0 +1,8 @@ +import wx + +if 'wxMac' in wx.PlatformInfo: + sizes = (10, 11, 12) +else: + sizes = (7, 8, 9) + +SMALL, NORMAL, BIG = sizes