X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..35d8bffe0132c6456678045a8ada4ca104bbc6f2:/wxPython/wx/lib/scrolledpanel.py diff --git a/wxPython/wx/lib/scrolledpanel.py b/wxPython/wx/lib/scrolledpanel.py index 3fb7704bc3..122cdde7bd 100644 --- a/wxPython/wx/lib/scrolledpanel.py +++ b/wxPython/wx/lib/scrolledpanel.py @@ -1,40 +1,52 @@ #---------------------------------------------------------------------------- -# Name: wxScrolledPanel.py +# Name: scrolledpanel.py # Author: Will Sadkin # Created: 03/21/2003 # Copyright: (c) 2003 by Will Sadkin # RCS-ID: $Id$ # License: wxWindows license #---------------------------------------------------------------------------- +# 12/11/2003 - Jeff Grimmett (grimmtooth@softhome.net) +# +# o 2.5 compatability update. +# +# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net) +# +# o wxScrolledPanel -> ScrolledPanel # -from wxPython.wx import * +import wx -class wxScrolledPanel( wxScrolledWindow ): - """ -wxScrolledPanel fills a "hole" in the implementation of wxScrolledWindow, -providing automatic scrollbar and scrolling behavior and the tab traversal -management that wxScrolledWindow lacks. This code was based on the original -demo code showing how to do this, but is now available for general use -as a proper class (and the demo is now converted to just use it.) -""" - def __init__(self, parent, id=-1, - pos = wxDefaultPosition, size = wxDefaultSize, - style = wxTAB_TRAVERSAL, name = "scrolledpanel"): +class ScrolledPanel( wx.PyScrolledWindow ): - wxScrolledWindow.__init__(self, parent, -1, - pos=pos, size=size, - style=style, name=name) + """ ScrolledPanel fills a "hole" in the implementation of + wx.ScrolledWindow, providing automatic scrollbar and scrolling + behavior and the tab traversal management that wxScrolledWindow + lacks. This code was based on the original demo code showing how + to do this, but is now available for general use as a proper class + (and the demo is now converted to just use it.) - EVT_CHILD_FOCUS(self, self.OnChildFocus) + It is assumed that the ScrolledPanel will have a sizer, as it is + used to calculate the minimal virtual size of the panel and etc. + """ + + def __init__(self, parent, id=-1, pos = wx.DefaultPosition, + size = wx.DefaultSize, style = wx.TAB_TRAVERSAL, + name = "scrolledpanel"): + + wx.PyScrolledWindow.__init__(self, parent, id, + pos=pos, size=size, + style=style, name=name) + self.SetBestFittingSize(size) + self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus) def SetupScrolling(self, scroll_x=True, scroll_y=True, rate_x=20, rate_y=20): """ This function sets up the event handling necessary to handle scrolling properly. It should be called within the __init__ - function of any class that is derived from wxScrolledPanel, + function of any class that is derived from ScrolledPanel, once the controls on the panel have been constructed and thus the size of the scrolling area can be determined. @@ -53,10 +65,13 @@ as a proper class (and the demo is now converted to just use it.) if rate_y: h += rate_y - (h % rate_y) self.SetVirtualSize( (w, h) ) - self.SetVirtualSizeHints( w, h ) + self.SetScrollRate(rate_x, rate_y) + wx.CallAfter(self._SetupAfter) # scroll back to top after initial events - self.SetScrollRate(rate_x, rate_y) - wxCallAfter(self.Scroll, 0, 0) # scroll back to top after initial events + + def _SetupAfter(self): + self.SetVirtualSize(self.GetBestVirtualSize()) + self.Scroll(0,0) def OnChildFocus(self, evt): @@ -67,29 +82,39 @@ as a proper class (and the demo is now converted to just use it.) sppu_x, sppu_y = self.GetScrollPixelsPerUnit() vs_x, vs_y = self.GetViewStart() - cpos = child.GetPosition() - csz = child.GetSize() + cr = child.GetRect() + clntsz = self.GetClientSize() new_vs_x, new_vs_y = -1, -1 # is it before the left edge? - if cpos.x < 0 and sppu_x > 0: - new_vs_x = vs_x + (cpos.x / sppu_x) + if cr.x < 0 and sppu_x > 0: + new_vs_x = vs_x + (cr.x / sppu_x) # is it above the top? - if cpos.y < 0 and sppu_y > 0: - new_vs_y = vs_y + (cpos.y / sppu_y) + if cr.y < 0 and sppu_y > 0: + new_vs_y = vs_y + (cr.y / sppu_y) + # For the right and bottom edges, scroll enough to show the + # whole control if possible, but if not just scroll such that + # the top/left edges are still visible # is it past the right edge ? - if cpos.x + csz.width > self.GetClientSize().width and sppu_x > 0: - diff = (cpos.x + csz.width - self.GetClientSize().width) / sppu_x - new_vs_x = vs_x + diff + 1 - + if cr.right > clntsz.width and sppu_x > 0: + diff = (cr.right - clntsz.width) / sppu_x + if cr.x - diff * sppu_x > 0: + new_vs_x = vs_x + diff + 1 + else: + new_vs_x = vs_x + (cr.x / sppu_x) + # is it below the bottom ? - if cpos.y + csz.height > self.GetClientSize().height and sppu_y > 0: - diff = (cpos.y + csz.height - self.GetClientSize().height) / sppu_y - new_vs_y = vs_y + diff + 1 + if cr.bottom > clntsz.height and sppu_y > 0: + diff = (cr.bottom - clntsz.height) / sppu_y + if cr.y - diff * sppu_y > 0: + new_vs_y = vs_y + diff + 1 + else: + new_vs_y = vs_y + (cr.y / sppu_y) # if we need to adjust if new_vs_x != -1 or new_vs_y != -1: + #print "%s: (%s, %s)" % (self.GetName(), new_vs_x, new_vs_y) self.Scroll(new_vs_x, new_vs_y)