Minor refactor of the snapshot code
This commit is contained in:
@@ -949,12 +949,11 @@ class PFTabsContainer(wx.Panel):
|
||||
if self.TabHitTest(tab, mposx, mposy):
|
||||
try:
|
||||
page = self.Parent.GetPage(self.GetTabIndex(tab))
|
||||
if page.CanUseSnapshot():
|
||||
if hasattr(page, "Snapshot"):
|
||||
if not self.previewTimer:
|
||||
self.previewTimer = wx.Timer(self, self.previewTimerID)
|
||||
|
||||
self.previewTab = tab
|
||||
self.previewBmp = page.FVsnapshot
|
||||
self.previewTimer.Start(1500, True)
|
||||
break
|
||||
except:
|
||||
@@ -1171,8 +1170,8 @@ class PFTabsContainer(wx.Panel):
|
||||
cposx, cposy = self.ScreenToClient((mposx, mposy))
|
||||
if self.FindTabAtPos(cposx, cposy) == self.previewTab:
|
||||
if not self.previewTab.GetSelected():
|
||||
|
||||
self.previewWnd = PFNotebookPagePreview(self,(mposx+3,mposy+3), self.previewBmp, self.previewTab.text)
|
||||
page = self.Parent.GetPage(self.GetTabIndex(self.previewTab))
|
||||
self.previewWnd = PFNotebookPagePreview(self,(mposx+3,mposy+3), page.Snapshot(), self.previewTab.text)
|
||||
self.previewWnd.Show()
|
||||
|
||||
event.Skip()
|
||||
|
||||
@@ -369,19 +369,20 @@ class FittingView(d.Display):
|
||||
|
||||
def OnShow(self, event):
|
||||
if not event.GetShow():
|
||||
self.Snapshot()
|
||||
self.MakeSnapshot()
|
||||
event.Skip()
|
||||
|
||||
def CanUseSnapshot(self):
|
||||
return True
|
||||
|
||||
def Snapshot(self):
|
||||
return self.FVsnapshot
|
||||
|
||||
def MakeSnapshot(self):
|
||||
if self.FVsnapshot:
|
||||
del self.FVsnapshot
|
||||
|
||||
wantedWidth = 0
|
||||
for i in xrange(4):
|
||||
wantedWidth += self.GetColumnWidth(i)
|
||||
|
||||
rect = self.GetRect()
|
||||
rect.height = min(rect.height, 400)
|
||||
rect.width = min(rect.width, wantedWidth)
|
||||
|
||||
Reference in New Issue
Block a user