Added getTextExtentW - returns the width in pixels for a given string, replaced hardcode values previously introduced by my last 2 commits with this function. This is a sane way to always have the right control size no matter what font is used
This commit is contained in:
@@ -40,6 +40,13 @@ class StatsPane(wx.Panel):
|
|||||||
self.miniPanel.Show(collapsed)
|
self.miniPanel.Show(collapsed)
|
||||||
self.mainFrame.statsSizer.Layout()
|
self.mainFrame.statsSizer.Layout()
|
||||||
|
|
||||||
|
def getTextExtentW(self, text):
|
||||||
|
tfont=self.GetFont()
|
||||||
|
mdc=wx.MemoryDC()
|
||||||
|
mdc.SetFont(tfont)
|
||||||
|
width, height = mdc.GetTextExtent( text )
|
||||||
|
return width
|
||||||
|
|
||||||
def fitChanged(self, event):
|
def fitChanged(self, event):
|
||||||
cFit = controller.Fit.getInstance()
|
cFit = controller.Fit.getInstance()
|
||||||
fit = cFit.getFit(event.fitID)
|
fit = cFit.getFit(event.fitID)
|
||||||
@@ -282,7 +289,7 @@ class StatsPane(wx.Panel):
|
|||||||
labelResources = wx.StaticText(parent, wx.ID_ANY, "Resources")
|
labelResources = wx.StaticText(parent, wx.ID_ANY, "Resources")
|
||||||
labelResources.SetFont(boldFont)
|
labelResources.SetFont(boldFont)
|
||||||
sizer = wx.FlexGridSizer(3, 2)
|
sizer = wx.FlexGridSizer(3, 2)
|
||||||
sizer.SetMinSize(wx.Size(75,0))
|
sizer.SetMinSize(wx.Size(27 + self.getTextExtentW("400/400"), 0))
|
||||||
for i in xrange(3):
|
for i in xrange(3):
|
||||||
sizer.AddGrowableCol(i + 1)
|
sizer.AddGrowableCol(i + 1)
|
||||||
|
|
||||||
@@ -441,8 +448,7 @@ class StatsPane(wx.Panel):
|
|||||||
if self._showNormalGauges == True:
|
if self._showNormalGauges == True:
|
||||||
box.Add(wx.StaticText(self.fullPanel, wx.ID_ANY, "%"), 0, wx.ALIGN_CENTER)
|
box.Add(wx.StaticText(self.fullPanel, wx.ID_ANY, "%"), 0, wx.ALIGN_CENTER)
|
||||||
|
|
||||||
|
lbl = wx.StaticText(self.fullPanel, wx.ID_ANY, "0" if tankType != "damagePattern" else "", wx.DefaultPosition, wx.Size(self.getTextExtentW("WWWWk"), -1), wx.ALIGN_CENTER)
|
||||||
lbl = wx.StaticText(self.fullPanel, wx.ID_ANY, "0" if tankType != "damagePattern" else "", wx.DefaultPosition, wx.Size(32,-1), wx.ALIGN_CENTER)
|
|
||||||
setattr(self, "labelResistance%sEhp" % tankType.capitalize(), lbl)
|
setattr(self, "labelResistance%sEhp" % tankType.capitalize(), lbl)
|
||||||
sizerResistances.Add(lbl, 0, wx.ALIGN_CENTER)
|
sizerResistances.Add(lbl, 0, wx.ALIGN_CENTER)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user