Fix bug where fullscreen on mac caused problems with the progress panels being below...

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 4cb5b604fa187458dcf3a99bc65b62e2db0a5617..8a7fc57bb4163b9de8508b2b0eaf8d3c47930ebf 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -399,7 +399,8 @@ class mainWindow(configBase.configWindowBase):
                self.sizer.Layout()
                newSize = self.GetSize();
                newSize.IncBy(0, spp.GetSize().GetHeight())
-               self.SetSize(newSize)
+               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
+                       self.SetSize(newSize)
                self.progressPanelList.append(spp)
        
        def OnPrint(self, e):
@@ -430,7 +431,8 @@ class mainWindow(configBase.configWindowBase):
                self.progressPanelList.remove(spp)
                newSize = self.GetSize();
                newSize.IncBy(0, -spp.GetSize().GetHeight())
-               self.SetSize(newSize)
+               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
+                       self.SetSize(newSize)
                spp.Show(False)
                self.sizer.Detach(spp)
                for spp in self.progressPanelList:

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 50b9c9674bc549080cdbe949cd9cf6f669da4dbc..d27f0d4365c8932bcd3d704266236367705ace94 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -273,7 +273,8 @@ class simpleModeWindow(configBase.configWindowBase):
                self.sizer.Layout()
                newSize = self.GetSize();
                newSize.IncBy(0, spp.GetSize().GetHeight())
-               self.SetSize(newSize)
+               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
+                       self.SetSize(newSize)
                self.progressPanelList.append(spp)
                
                #Restore the old profile.
@@ -298,11 +299,12 @@ class simpleModeWindow(configBase.configWindowBase):
                self.progressPanelList.remove(spp)
                newSize = self.GetSize();
                newSize.IncBy(0, -spp.GetSize().GetHeight())
-               self.SetSize(newSize)
-               self.sizer.Remove(spp)
-               spp.Destroy()
+               if newSize.GetWidth() < wx.GetDisplaySize()[0]:
+                       self.SetSize(newSize)
+               spp.Show(False)
+               self.sizer.Detach(spp)
                for spp in self.progressPanelList:
-                       self.sizer.Remove(spp)
+                       self.sizer.Detach(spp)
                i = 2
                for spp in self.progressPanelList:
                        self.sizer.Add(spp, (i,0), span=(1,4), flag=wx.EXPAND)