q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

master
Daid 2012-10-26 11:30:45 +02:00
parent 6cc99b4e44
commit f70e88521c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cura/gui/mainWindow.py
View File

@ -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:

12
Cura/gui/simpleMode.py
View File

@ -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)