From: Daid <Daid303@gmail.com>
Date: Fri, 26 Oct 2012 09:30:45 +0000 (+0200)
Subject: Fix bug where fullscreen on mac caused problems with the progress panels being below... 
X-Git-Tag: 13.03~236
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f70e88521cbe39104291dacfd2af96561d4fd76a;p=cura.git

Fix bug where fullscreen on mac caused problems with the progress panels being below the screen. Fixed the bug where on Mac removing a progress panel caused a crash, but only in simple mode.
---

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 4cb5b604..8a7fc57b 100644
--- 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 50b9c967..d27f0d43 100644
--- 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)