diff --git a/gui/builtinMarketBrowser/pfSearchBox.py b/gui/builtinMarketBrowser/pfSearchBox.py index d1e8f2f40..0cd8ea556 100644 --- a/gui/builtinMarketBrowser/pfSearchBox.py +++ b/gui/builtinMarketBrowser/pfSearchBox.py @@ -253,8 +253,8 @@ class PFSearchBox(wx.Window): else: spad = 0 - dc.DrawBitmap(self.searchBitmapShadow, self.searchButtonX + 1, self.searchButtonY + 1) - dc.DrawBitmap(self.searchBitmap, self.searchButtonX + spad, self.searchButtonY + spad) + dc.DrawBitmap(self.searchBitmapShadow, round(self.searchButtonX + 1), round(self.searchButtonY + 1)) + dc.DrawBitmap(self.searchBitmap, round(self.searchButtonX + spad), round(self.searchButtonY + spad)) if self.isCancelButtonVisible: if self.cancelBitmap: @@ -262,8 +262,8 @@ class PFSearchBox(wx.Window): cpad = 1 else: cpad = 0 - dc.DrawBitmap(self.cancelBitmapShadow, self.cancelButtonX + 1, self.cancelButtonY + 1) - dc.DrawBitmap(self.cancelBitmap, self.cancelButtonX + cpad, self.cancelButtonY + cpad) + dc.DrawBitmap(self.cancelBitmapShadow, round(self.cancelButtonX + 1), round(self.cancelButtonY + 1)) + dc.DrawBitmap(self.cancelBitmap, round(self.cancelButtonX + cpad), round(self.cancelButtonY + cpad)) dc.SetPen(wx.Pen(sepColor, 1)) dc.DrawLine(0, rect.height - 1, rect.width, rect.height - 1) diff --git a/gui/builtinShipBrowser/categoryItem.py b/gui/builtinShipBrowser/categoryItem.py index b88557d22..6267edb93 100644 --- a/gui/builtinShipBrowser/categoryItem.py +++ b/gui/builtinShipBrowser/categoryItem.py @@ -104,14 +104,14 @@ class CategoryItem(SFBrowserItem): textColor = colorUtils.GetSuitable(windowColor, 1) mdc.SetTextForeground(textColor) - mdc.DrawBitmap(self.dropShadowBitmap, self.shipBmpx + 1, self.shipBmpy + 1) - mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0) + mdc.DrawBitmap(self.dropShadowBitmap, round(self.shipBmpx + 1), round(self.shipBmpy + 1)) + mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0) mdc.SetFont(self.fontBig) categoryName, fittings = self.fittingInfo - mdc.DrawText(categoryName, self.catx, self.caty) + mdc.DrawText(categoryName, round(self.catx), round(self.caty)) # ============================================================================= diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py index bd37b0b94..fad2e1819 100644 --- a/gui/builtinShipBrowser/fitItem.py +++ b/gui/builtinShipBrowser/fitItem.py @@ -493,9 +493,9 @@ class FitItem(SFItem.SFBrowserItem): else: shipEffBk = self.shipEffBk - mdc.DrawBitmap(shipEffBk, self.shipEffx, self.shipEffy, 0) + mdc.DrawBitmap(shipEffBk, round(self.shipEffx), round(self.shipEffy), 0) - mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0) + mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0) mdc.SetFont(self.fontNormal) @@ -504,17 +504,17 @@ class FitItem(SFItem.SFBrowserItem): pfdate = drawUtils.GetPartialText(mdc, fitLocalDate, self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw) - mdc.DrawText(pfdate, self.textStartx, self.timestampy) + mdc.DrawText(pfdate, round(self.textStartx), round(self.timestampy)) mdc.SetFont(self.fontSmall) - mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery) + mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery)) mdc.SetFont(self.fontBig) psname = drawUtils.GetPartialText(mdc, self.fitName, self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw) - mdc.DrawText(psname, self.textStartx, self.fitNamey) + mdc.DrawText(psname, round(self.textStartx), round(self.fitNamey)) if self.tcFitName.IsShown(): self.AdjustControlSizePos(self.tcFitName, self.textStartx, self.toolbarx - self.editWidth - self.padding) diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py index 83dff8216..f36311f74 100644 --- a/gui/builtinShipBrowser/navigationPanel.py +++ b/gui/builtinShipBrowser/navigationPanel.py @@ -231,7 +231,7 @@ class NavigationPanel(SFItem.SFBrowserItem): self.toolbar.SetPosition((self.toolbarx, self.toolbary)) mdc.SetFont(self.fontSmall) - mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery) + mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery)) mdc.SetPen(wx.Pen(sepColor, 1)) mdc.DrawLine(0, rect.height - 1, rect.width, rect.height - 1) diff --git a/gui/builtinShipBrowser/raceSelector.py b/gui/builtinShipBrowser/raceSelector.py index 809474249..d99b6bae5 100644 --- a/gui/builtinShipBrowser/raceSelector.py +++ b/gui/builtinShipBrowser/raceSelector.py @@ -194,25 +194,25 @@ class RaceSelector(wx.Window): bmp = wx.Bitmap(img) if self.layout == wx.VERTICAL: - mdc.DrawBitmap(dropShadow, rect.width - self.buttonsPadding - bmp.GetWidth() + 1, y + 1) - mdc.DrawBitmap(bmp, rect.width - self.buttonsPadding - bmp.GetWidth(), y) + mdc.DrawBitmap(dropShadow, round(rect.width - self.buttonsPadding - bmp.GetWidth() + 1), round(y + 1)) + mdc.DrawBitmap(bmp, round(rect.width - self.buttonsPadding - bmp.GetWidth()), round(y)) y += raceBmp.GetHeight() + self.buttonsPadding mdc.SetPen(wx.Pen(sepColor, 1)) mdc.DrawLine(rect.width - 1, 0, rect.width - 1, rect.height) else: - mdc.DrawBitmap(dropShadow, x + 1, self.buttonsPadding + 1) - mdc.DrawBitmap(bmp, x, self.buttonsPadding) + mdc.DrawBitmap(dropShadow, round(x + 1), round(self.buttonsPadding + 1)) + mdc.DrawBitmap(bmp, round(x), round(self.buttonsPadding)) x += raceBmp.GetWidth() + self.buttonsPadding mdc.SetPen(wx.Pen(sepColor, 1)) mdc.DrawLine(0, 0, rect.width, 0) if self.direction < 1: if self.layout == wx.VERTICAL: - mdc.DrawBitmap(self.bmpArrow, -2, (rect.height - self.bmpArrow.GetHeight()) / 2) + mdc.DrawBitmap(self.bmpArrow, -2, round((rect.height - self.bmpArrow.GetHeight()) / 2)) else: mdc.SetPen(wx.Pen(sepColor, 1)) mdc.DrawLine(0, 0, rect.width, 0) - mdc.DrawBitmap(self.bmpArrow, (rect.width - self.bmpArrow.GetWidth()) / 2, -2) + mdc.DrawBitmap(self.bmpArrow, round((rect.width - self.bmpArrow.GetWidth()) / 2), -2) def OnTimer(self, event): if event.GetId() == self.animTimerID: diff --git a/gui/builtinShipBrowser/sfBrowserItem.py b/gui/builtinShipBrowser/sfBrowserItem.py index 02fe03218..40920eaa7 100644 --- a/gui/builtinShipBrowser/sfBrowserItem.py +++ b/gui/builtinShipBrowser/sfBrowserItem.py @@ -233,8 +233,8 @@ class PFToolbar: bmpWidth = bmp.GetWidth() - pdc.DrawBitmap(dropShadowBmp, bx + self.padding / 2, self.toolbarY + self.padding / 2) - pdc.DrawBitmap(bmp, tbx, by) + pdc.DrawBitmap(dropShadowBmp, round(bx + self.padding / 2), round(self.toolbarY + self.padding / 2)) + pdc.DrawBitmap(bmp, round(tbx), round(by)) bx += bmpWidth + self.padding diff --git a/gui/builtinShipBrowser/shipItem.py b/gui/builtinShipBrowser/shipItem.py index 7c4d528d7..daff6b5d0 100644 --- a/gui/builtinShipBrowser/shipItem.py +++ b/gui/builtinShipBrowser/shipItem.py @@ -247,12 +247,12 @@ class ShipItem(SFItem.SFBrowserItem): else: shipEffBk = self.shipEffBk - mdc.DrawBitmap(shipEffBk, self.shipEffx, self.shipEffy, 0) + mdc.DrawBitmap(shipEffBk, round(self.shipEffx), round(self.shipEffy), 0) - mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0) + mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0) - mdc.DrawBitmap(self.raceDropShadowBmp, self.raceBmpx + 1, self.raceBmpy + 1) - mdc.DrawBitmap(self.raceBmp, self.raceBmpx, self.raceBmpy) + mdc.DrawBitmap(self.raceDropShadowBmp, round(self.raceBmpx + 1), round(self.raceBmpy + 1)) + mdc.DrawBitmap(self.raceBmp, round(self.raceBmpx), round(self.raceBmpy)) shipName, shipTrait, fittings = self.shipFittingInfo @@ -264,17 +264,17 @@ class ShipItem(SFItem.SFBrowserItem): fformat = "%d fits" mdc.SetFont(self.fontNormal) - mdc.DrawText(fformat % fittings if fittings > 0 else fformat, self.textStartx, self.fittingsy) + mdc.DrawText(fformat % fittings if fittings > 0 else fformat, round(self.textStartx), round(self.fittingsy)) mdc.SetFont(self.fontSmall) - mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery) + mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery)) mdc.SetFont(self.fontBig) psname = drawUtils.GetPartialText(mdc, shipName, self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw) - mdc.DrawText(psname, self.textStartx, self.shipNamey) + mdc.DrawText(psname, round(self.textStartx), round(self.shipNamey)) if self.tcFitName.IsShown(): self.AdjustControlSizePos(self.tcFitName, self.textStartx, self.toolbarx - self.editWidth - self.padding) diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 1aedef38b..8282fe8a9 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -146,8 +146,8 @@ class ResistancesViewFull(StatsView): lbl = PyGauge(contentPanel, font, 100) lbl.SetMinSize((48, 16)) - lbl.SetBackgroundColour(wx.Colour(bc[0], bc[1], bc[2])) - lbl.SetBarColour(wx.Colour(fc[0], fc[1], fc[2])) + lbl.SetBackgroundColour(wx.Colour(round(bc[0]), round(bc[1]), round(bc[2]))) + lbl.SetBarColour(wx.Colour(round(fc[0]), round(fc[1]), round(fc[2]))) lbl.SetBarGradient() lbl.SetFractionDigits(1) diff --git a/gui/chrome_tabs.py b/gui/chrome_tabs.py index 89687c33a..7754554da 100644 --- a/gui/chrome_tabs.py +++ b/gui/chrome_tabs.py @@ -530,11 +530,11 @@ class _TabRenderer: mbmp = wx.Bitmap(mimg) # draw middle bitmap, offset by left - mdc.DrawBitmap(mbmp, self.left_width, 0) + mdc.DrawBitmap(mbmp, round(self.left_width), 0) # draw right bitmap offset by left + middle mdc.DrawBitmap(self.ctab_right_bmp, - self.content_width + self.left_width, 0) + round(self.content_width + self.left_width), 0) mdc.SelectObject(wx.NullBitmap) @@ -555,7 +555,7 @@ class _TabRenderer: + self.left_width \ - self.ctab_close_bmp.GetWidth() / 2 y_offset = (self.tab_height - self.ctab_close_bmp.GetHeight()) / 2 - self.close_region.Offset(x_offset, y_offset) + self.close_region.Offset(round(x_offset), round(y_offset)) def InitColors(self): """Determines colors used for tab, based on system settings""" @@ -590,8 +590,8 @@ class _TabRenderer: # Draw tab icon mdc.DrawBitmap( bmp, - self.left_width + self.padding - bmp.GetWidth() / 2, - (height - bmp.GetHeight()) / 2) + round(self.left_width + self.padding - bmp.GetWidth() / 2), + round((height - bmp.GetHeight()) / 2)) # draw close button if self.closeable: @@ -604,8 +604,8 @@ class _TabRenderer: mdc.DrawBitmap( cbmp, - self.content_width + self.left_width - cbmp.GetWidth() / 2, - (height - cbmp.GetHeight()) / 2) + round(self.content_width + self.left_width - cbmp.GetWidth() / 2), + round((height - cbmp.GetHeight()) / 2)) mdc.SelectObject(wx.NullBitmap) @@ -640,7 +640,7 @@ class _TabRenderer: # draw text (with no ellipses) text = draw.GetPartialText(dc, self.text, maxsize, "") tx, ty = dc.GetTextExtent(text) - dc.DrawText(text, text_start + self.padding, height / 2 - ty / 2) + dc.DrawText(text, round(text_start + self.padding), round(height / 2 - ty / 2)) def __repr__(self): return "_TabRenderer(text={}, disabled={}) at {}".format( @@ -1005,7 +1005,7 @@ class _TabsContainer(wx.Panel): region = tab.GetCloseButtonRegion() posx, posy = tab.GetPosition() - region.Offset(posx, posy) + region.Offset(round(posx), round(posy)) if region.Contains(x, y): index = self.tabs.index(tab) @@ -1036,7 +1036,7 @@ class _TabsContainer(wx.Panel): region = self.add_button.GetRegion() ax, ay = self.add_button.GetPosition() - region.Offset(ax, ay) + region.Offset(round(ax), round(ay)) if region.Contains(x, y): ev = PageAdding() @@ -1058,7 +1058,7 @@ class _TabsContainer(wx.Panel): for tab in self.tabs: region = tab.GetCloseButtonRegion() posx, posy = tab.GetPosition() - region.Offset(posx, posy) + region.Offset(round(posx), round(posy)) if region.Contains(x, y): if not tab.GetCloseButtonHoverStatus(): @@ -1093,7 +1093,7 @@ class _TabsContainer(wx.Panel): tabRegion = tab.GetTabRegion() tabPos = tab.GetPosition() tabPosX, tabPosY = tabPos - tabRegion.Offset(tabPosX, tabPosY) + tabRegion.Offset(round(tabPosX), round(tabPosY)) if tabRegion.Contains(x, y): return True @@ -1166,7 +1166,7 @@ class _TabsContainer(wx.Panel): region = self.add_button.GetRegion() ax, ay = self.add_button.GetPosition() - region.Offset(ax, ay) + region.Offset(round(ax), round(ay)) if region.Contains(x, y): if not self.add_button.IsHighlighted(): @@ -1198,7 +1198,7 @@ class _TabsContainer(wx.Panel): if self.show_add_button: ax, ay = self.add_button.GetPosition() - mdc.DrawBitmap(self.add_button.Render(), ax, ay, True) + mdc.DrawBitmap(self.add_button.Render(), round(ax), round(ay), True) for i in range(len(self.tabs) - 1, -1, -1): tab = self.tabs[i] @@ -1206,12 +1206,12 @@ class _TabsContainer(wx.Panel): if not tab.IsSelected(): # drop shadow first - mdc.DrawBitmap(self.fxBmps[tab], posx, posy, True) + mdc.DrawBitmap(self.fxBmps[tab], round(posx), (posy), True) bmp = tab.Render() img = bmp.ConvertToImage() img = img.AdjustChannels(1, 1, 1, 0.85) bmp = wx.Bitmap(img) - mdc.DrawBitmap(bmp, posx, posy, True) + mdc.DrawBitmap(bmp, round(posx), (posy), True) mdc.SetDeviceOrigin(posx, posy) tab.DrawText(mdc) @@ -1224,7 +1224,7 @@ class _TabsContainer(wx.Panel): if selected: posx, posy = selected.GetPosition() # drop shadow first - mdc.DrawBitmap(self.fxBmps[selected], posx, posy, True) + mdc.DrawBitmap(self.fxBmps[selected], round(posx), round(posy), True) bmp = selected.Render() @@ -1233,7 +1233,7 @@ class _TabsContainer(wx.Panel): img = img.AdjustChannels(1.2, 1.2, 1.2, 0.7) bmp = wx.Bitmap(img) - mdc.DrawBitmap(bmp, posx, posy, True) + mdc.DrawBitmap(bmp, round(posx), round(posy), True) mdc.SetDeviceOrigin(posx, posy) selected.DrawText(mdc) diff --git a/gui/pyfa_gauge.py b/gui/pyfa_gauge.py index cd83f3eca..f1d0ab114 100644 --- a/gui/pyfa_gauge.py +++ b/gui/pyfa_gauge.py @@ -257,7 +257,7 @@ class PyGauge(wx.Window): else: w = rect.width * (float(value) / 100) r = copy.copy(rect) - r.width = w + r.width = round(w) dc.DrawRectangle(r) else: # if bar color is not set, then we use pre-defined transitions @@ -269,7 +269,7 @@ class PyGauge(wx.Window): else: w = rect.width * (float(value) / 100) r = copy.copy(rect) - r.width = w + r.width = round(w) # determine transition range number and calculate xv (which is the # progress between the two transition ranges) @@ -317,7 +317,7 @@ class PyGauge(wx.Window): gradient_color ) if gradient_bitmap is not None: - dc.DrawBitmap(gradient_bitmap, r.left, r.top) + dc.DrawBitmap(gradient_bitmap, round(r.left), round(r.top)) # font stuff begins here dc.SetFont(self.font) diff --git a/gui/utils/draw.py b/gui/utils/draw.py index 4e486afda..04c7e6af0 100644 --- a/gui/utils/draw.py +++ b/gui/utils/draw.py @@ -43,14 +43,14 @@ def DrawGradientBar(width, height, gStart, gEnd, gMid=None, fillRatio=4): mdc.SelectObject(canvas) r = wx.Rect(0, 0, width, height) - r.SetHeight(height / fillRatio) + r.SetHeight(round(height / fillRatio)) if gMid is None: gMid = gStart mdc.GradientFillLinear(r, gStart, gMid, wx.SOUTH) r.SetTop(r.GetHeight()) - r.SetHeight(height * (fillRatio - 1) / fillRatio + (1 if height % fillRatio != 0 else 0)) + r.SetHeight(round(height * (fillRatio - 1) / fillRatio + (1 if height % fillRatio != 0 else 0))) mdc.GradientFillLinear(r, gMid, gEnd, wx.SOUTH)