From 8045b3ade2179b591da75c0856e9f14be983edc1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 24 Oct 2018 19:31:34 -0700 Subject: [PATCH] Merge pull request #1048 from SilverViking/master Fixed bug with image in floatcanvas incorrectly getting rescaled to zero width and height during frame resize. (cherry picked from commit cb77b7cf89429fb0638e33be85af5b3238c75561) --- wx/lib/floatcanvas/FCObjects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wx/lib/floatcanvas/FCObjects.py b/wx/lib/floatcanvas/FCObjects.py index a4cfd97b..b9816528 100644 --- a/wx/lib/floatcanvas/FCObjects.py +++ b/wx/lib/floatcanvas/FCObjects.py @@ -2333,7 +2333,7 @@ class ScaledBitmap2(TextObjectMixin, DrawObject, ): Hb = BBbitmap[1,1] - Yb FullHeight = ScaleWorldToPixel(self.Height)[0] - scale = FullHeight / self.bmpWH[1] + scale = float(FullHeight) / float(self.bmpWH[1]) Ws = int(scale * Wb + 0.5) # add the 0.5 to round Hs = int(scale * Hb + 0.5) if (self.ScaledBitmap is None) or (self.ScaledBitmap[0] != (Xb, Yb, Wb, Hb, Ws, Ws) ):