dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Trim fleetName/fleet size accordingly to available free space

Browse Source
This commit is contained in:
HomeWorld
2010-11-23 20:40:00 +02:00
parent e3bdeb0fc6
commit cd110b14df
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gui/fleetBrowser.py
View File

@@ -413,16 +413,7 @@ class FleetItem(wx.Window):
textStart = self.padding + self.fleetBmp.GetWidth() textStart = self.padding + self.fleetBmp.GetWidth()
suffix = "%d ships" % self.fleetCount if self.fleetCount >1 else "%d ship" % self.fleetCount if self.fleetCount == 1 else "No ships" suffix = "%d ships" % self.fleetCount if self.fleetCount >1 else "%d ship" % self.fleetCount if self.fleetCount == 1 else "No ships"
fleetCount = "Fleet size: %s" % suffix fleetCount = "Fleet size: %s" % suffix
bdc.SetFont(self.fontBig)
fnx,fny = bdc.GetTextExtent(self.fleetName)
bdc.DrawText(self.fleetName, textStart, (rect.height/2 - fny)/2)
bdc.SetFont(self.fontSmall)
fcx,fcy = bdc.GetTextExtent(fleetCount)
bdc.DrawText(fleetCount, textStart, rect.height/2 + (rect.height/2 -fcy) / 2 )
btnWidth,btnHeight = self.btnSize btnWidth,btnHeight = self.btnSize
self.deletePosX = rect.width - btnWidth - self.padding self.deletePosX = rect.width - btnWidth - self.padding
self.renamePosX = self.deletePosX - btnWidth self.renamePosX = self.deletePosX - btnWidth
@@ -431,6 +422,10 @@ class FleetItem(wx.Window):
# - self.padding # - self.padding
self.renamePosY = self.deletePosY = self.copyPosY = (rect.height - btnHeight) / 2 self.renamePosY = self.deletePosY = self.copyPosY = (rect.height - btnHeight) / 2
tx = 0
bdc.SetFont(self.fontSmall)
if self.highlighted: if self.highlighted:
brush = wx.Brush(self.btnbgcolour) brush = wx.Brush(self.btnbgcolour)
pen = wx.Pen(self.btnbgcolour) pen = wx.Pen(self.btnbgcolour)
@@ -462,6 +457,39 @@ class FleetItem(wx.Window):
bdc.DrawBitmap(self.renameBmpGrey, self.renamePosX + 1, self.renamePosY + 1 ) bdc.DrawBitmap(self.renameBmpGrey, self.renamePosX + 1, self.renamePosY + 1 )
bdc.DrawBitmap(self.deleteBmpGrey, self.deletePosX + 1, self.deletePosY + 1 ) bdc.DrawBitmap(self.deleteBmpGrey, self.deletePosX + 1, self.deletePosY + 1 )
bdc.SetFont(self.fontBig)
fnx,fny = bdc.GetTextExtent(self.fleetName)
fnwidths = bdc.GetPartialTextExtents(self.fleetName)
count = 0
maxsize = self.copyPosX - 8 - tx - textStart
for i in fnwidths:
if i <= maxsize:
count +=1
else:
break
count -= 2
bdc.DrawText(self.fleetName[:count] + ".." if count < len(self.fleetName) - 2 else self.fleetName , textStart, (rect.height/2 - fny)/2)
bdc.SetFont(self.fontSmall)
fcx,fcy = bdc.GetTextExtent(fleetCount)
fnwidths = bdc.GetPartialTextExtents(fleetCount)
count = 0
maxsize = self.copyPosX - 8 - tx - textStart
for i in fnwidths:
if i <= maxsize:
count +=1
else:
break
count -= 2
bdc.DrawText(fleetCount[:count] + ".." if count < len(fleetCount) - 2 else fleetCount, textStart, rect.height/2 + (rect.height/2 -fcy) / 2 )
self.AdjustFleetNameEditSize(textStart, self.copyPosX - self.editWidth - self.padding) self.AdjustFleetNameEditSize(textStart, self.copyPosX - self.editWidth - self.padding)
def AdjustFleetNameEditSize(self, start,end): def AdjustFleetNameEditSize(self, start,end):