Change the MacOS toolbar fix so we only add 1 panel to the window.

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index fdfc0829766ad566525f18c45389d15c57c5ebad..ee9e9d23b8a876bb83c2e2c5793bbb14f335788c 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -149,8 +149,10 @@ class projectPlanner(wx.Frame):
        def __init__(self):\r
                super(projectPlanner, self).__init__(None, title='Cura - Project Planner')\r
                \r
-               self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))\r
                wx.EVT_CLOSE(self, self.OnClose)\r
+               self.panel = wx.Panel(self, -1)\r
+               self.SetSizer(wx.BoxSizer(wx.VERTICAL))\r
+               self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)\r
                #self.SetIcon(icon.getMainIcon())\r
                \r
                self.list = []\r
@@ -166,10 +168,7 @@ class projectPlanner(wx.Frame):
                        util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x2'), profile.getPreferenceFloat('extruder_offset_y2'), 0),\r
                        util3d.Vector3(profile.getPreferenceFloat('extruder_offset_x3'), profile.getPreferenceFloat('extruder_offset_y3'), 0)]\r
 \r
-               self.toolbarPanel = wx.Panel(self, -1)\r
-               self.toolbarPanel.SetSizer(wx.BoxSizer(wx.VERTICAL))\r
-               self.toolbar = toolbarUtil.Toolbar(self.toolbarPanel)\r
-               self.toolbarPanel.GetSizer().Add(self.toolbar, 0, flag=wx.EXPAND)\r
+               self.toolbar = toolbarUtil.Toolbar(self.panel)\r
 \r
                toolbarUtil.NormalButton(self.toolbar, self.OnLoadProject, 'open.png', 'Open project')\r
                toolbarUtil.NormalButton(self.toolbar, self.OnSaveProject, 'save.png', 'Save project')\r
@@ -184,10 +183,7 @@ class projectPlanner(wx.Frame):
                \r
                self.toolbar.Realize()\r
 \r
-               self.toolbar2Panel = wx.Panel(self, -1)\r
-               self.toolbar2Panel.SetSizer(wx.BoxSizer(wx.VERTICAL))\r
-               self.toolbar2 = toolbarUtil.Toolbar(self.toolbar2Panel)\r
-               self.toolbar2Panel.GetSizer().Add(self.toolbar2, 0, flag=wx.EXPAND)\r
+               self.toolbar2 = toolbarUtil.Toolbar(self.panel)\r
 \r
                toolbarUtil.NormalButton(self.toolbar2, self.OnAddModel, 'object-add.png', 'Add model')\r
                toolbarUtil.NormalButton(self.toolbar2, self.OnRemModel, 'object-remove.png', 'Remove model')\r
@@ -202,16 +198,16 @@ class projectPlanner(wx.Frame):
                self.toolbar2.Realize()\r
                \r
                sizer = wx.GridBagSizer(2,2)\r
-               self.SetSizer(sizer)\r
-               self.preview = PreviewGLCanvas(self)\r
-               self.listbox = wx.ListBox(self, -1, choices=[])\r
-               self.addButton = wx.Button(self, -1, "Add")\r
-               self.remButton = wx.Button(self, -1, "Remove")\r
-               self.sliceButton = wx.Button(self, -1, "Slice")\r
-               self.autoPlaceButton = wx.Button(self, -1, "Auto Place")\r
-               \r
-               sizer.Add(self.toolbarPanel, (0,0), span=(1,1), flag=wx.EXPAND|wx.LEFT|wx.RIGHT)\r
-               sizer.Add(self.toolbar2Panel, (0,1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.RIGHT)\r
+               self.panel.SetSizer(sizer)\r
+               self.preview = PreviewGLCanvas(self.panel, self)\r
+               self.listbox = wx.ListBox(self.panel, -1, choices=[])\r
+               self.addButton = wx.Button(self.panel, -1, "Add")\r
+               self.remButton = wx.Button(self.panel, -1, "Remove")\r
+               self.sliceButton = wx.Button(self.panel, -1, "Slice")\r
+               self.autoPlaceButton = wx.Button(self.panel, -1, "Auto Place")\r
+               \r
+               sizer.Add(self.toolbar, (0,0), span=(1,1), flag=wx.EXPAND|wx.LEFT|wx.RIGHT)\r
+               sizer.Add(self.toolbar2, (0,1), span=(1,2), flag=wx.EXPAND|wx.LEFT|wx.RIGHT)\r
                sizer.Add(self.preview, (1,0), span=(4,1), flag=wx.EXPAND)\r
                sizer.Add(self.listbox, (1,1), span=(1,2), flag=wx.EXPAND)\r
                sizer.Add(self.addButton, (2,1), span=(1,1))\r
@@ -227,7 +223,7 @@ class projectPlanner(wx.Frame):
                self.autoPlaceButton.Bind(wx.EVT_BUTTON, self.OnAutoPlace)\r
                self.listbox.Bind(wx.EVT_LISTBOX, self.OnListSelect)\r
 \r
-               panel = wx.Panel(self, -1)\r
+               panel = wx.Panel(self.panel, -1)\r
                sizer.Add(panel, (4,1), span=(1,2))\r
                \r
                sizer = wx.GridBagSizer(2,2)\r
@@ -574,10 +570,10 @@ class projectPlanner(wx.Frame):
                self.preview.Refresh()\r
 \r
 class PreviewGLCanvas(glcanvas.GLCanvas):\r
-       def __init__(self, parent):\r
+       def __init__(self, parent, projectPlannerWindow):\r
                attribList = (glcanvas.WX_GL_RGBA, glcanvas.WX_GL_DOUBLEBUFFER, glcanvas.WX_GL_DEPTH_SIZE, 24, glcanvas.WX_GL_STENCIL_SIZE, 8)\r
                glcanvas.GLCanvas.__init__(self, parent, attribList = attribList)\r
-               self.parent = parent\r
+               self.parent = projectPlannerWindow\r
                self.context = glcanvas.GLContext(self)\r
                wx.EVT_PAINT(self, self.OnPaint)\r
                wx.EVT_SIZE(self, self.OnSize)\r