Commit 4f43bf27137989e66bfde8f28ee38e8e4862e3e4

Authored by tatiana
1 parent 9cd06cb5

FIX: THird try on toolbar size under linux and win

invesalius/data/viewer_slice.py
... ... @@ -225,7 +225,7 @@ class Viewer(wx.Panel):
225 225 text_actor = vtk.vtkActor2D()
226 226 text_actor.SetMapper(text_mapper)
227 227 text_actor.SetLayerNumber(1)
228   - text_actor.GetPositionCoordinate().SetValue(20, 20)
  228 + text_actor.GetPositionCoordinate().SetValue(2, 2)
229 229 text_actor.SetVisibility(1)
230 230  
231 231 ren.AddActor(actor)
... ...
invesalius/data/viewer_volume.py
... ... @@ -74,8 +74,6 @@ class Viewer(wx.Panel):
74 74  
75 75 def HideRaycastingVolume(self, pubsub_evt):
76 76 pass
77   -
78   -
79 77  
80 78 def ChangeBackgroundColour(self, pubsub_evt):
81 79 colour = pubsub_evt.data
... ...
invesalius/gui/frame.py
... ... @@ -258,7 +258,10 @@ class ProjectToolBar(wx.ToolBar):
258 258 # TODO: what will appear in menubar?
259 259 def __init__(self, parent):
260 260 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER)
261   - self.SetToolBitmapSize(wx.Size(25,25))
  261 + if sys.platform == 'darwin':
  262 + self.SetToolBitmapSize(wx.Size(25,25))
  263 + else:
  264 + self.SetToolBitmapSize(wx.Size(16,16))
262 265 self.parent = parent
263 266 self.__init_items()
264 267 self.__bind_events()
... ... @@ -284,7 +287,10 @@ class ObjectToolBar(wx.ToolBar):
284 287 # TODO: what will appear in menubar?
285 288 def __init__(self, parent):
286 289 wx.ToolBar.__init__(self, parent, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT|wx.TB_NODIVIDER)
287   - self.SetToolBitmapSize(wx.Size(25,25))
  290 + if sys.platform == 'darwin':
  291 + self.SetToolBitmapSize(wx.Size(25,25))
  292 + else:
  293 + self.SetToolBitmapSize(wx.Size(16,16))
288 294 self.parent = parent
289 295 self.__init_items()
290 296 self.__bind_events()
... ...