Skip to content

P
Printrun
Commit f639bce1 authored by Guillaume Seguin's avatar Guillaume Seguin
Browse files
Options

Derive ZButtons size from background image

parent 3b666253
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
printrun/zbuttons.py
View file @ f639bce1
...@@ -33,7 +33,6 @@ class ZButtons(BufferedCanvas): ...@@ -33,7 +33,6 @@ class ZButtons(BufferedCanvas):
2: (1.1, 68, 13), 2: (1.1, 68, 13),
} }
imagename = "control_z.png" imagename = "control_z.png"
size = (59, 244)
def __init__(self, parent, moveCallback = None, bgcolor = "#FFFFFF", ID=-1): def __init__(self, parent, moveCallback = None, bgcolor = "#FFFFFF", ID=-1):
self.bg_bmp = wx.Image(imagefile(self.imagename), wx.BITMAP_TYPE_PNG).ConvertToBitmap() self.bg_bmp = wx.Image(imagefile(self.imagename), wx.BITMAP_TYPE_PNG).ConvertToBitmap()
...@@ -49,7 +48,7 @@ class ZButtons(BufferedCanvas): ...@@ -49,7 +48,7 @@ class ZButtons(BufferedCanvas):
self.bgcolor.SetFromName(bgcolor) self.bgcolor.SetFromName(bgcolor)
self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128) self.bgcolormask = wx.Colour(self.bgcolor.Red(), self.bgcolor.Green(), self.bgcolor.Blue(), 128)
BufferedCanvas.__init__(self, parent, ID, size=wx.Size(*self.size)) BufferedCanvas.__init__(self, parent, ID, size=self.bg_bmp.GetSize())
# Set up mouse and keyboard event capture # Set up mouse and keyboard event capture
self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
...@@ -167,5 +166,4 @@ class ZButtonsMini(ZButtons): ...@@ -167,5 +166,4 @@ class ZButtonsMini(ZButtons):
1: (1, 42.8, 12.9), 1: (1, 42.8, 12.9),
} }
imagename = "control_z_mini.png" imagename = "control_z_mini.png"
size = (59, 244)
move_values = [0.1, 10] move_values = [0.1, 10]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment