Changeset 1572

Timestamp:

08/07/08 18:14:29 (4 months ago)

Author:

rob

Message:

Fixed #481: added save position data for switching buffers
* leveraged the MajorMode?'s getViewPositionData to create an options dict, which is then passed to showInitialPosition
* changed BufferFrame?.setBuffer to take the options dict as an argument

Location:

trunk/peppy

Files:

• frame.py (modified) (2 diffs)
• fundamental.py (modified) (1 diff)
• plugins/switch_buffers.py (modified) (2 diffs)

trunk/peppy/frame.py

@@ -665 +665 @@
         return False
 
-    def setBuffer(self, buffer, wrapper=None):
+    def setBuffer(self, buffer, wrapper=None, options=None):
         if wrapper is None:
             # this gets a default view for the selected buffer
@@ -672 +672 @@
         assert self.dprint("set buffer to new view %s" % mode)
         self.tabs.updateWrapper(wrapper)
-    
+        if options:
+            mode.showInitialPosition(buffer.raw_url, options)
+
     def newBuffer(self, buffer):
         # proxy it up to tabs

trunk/peppy/fundamental.py

@@ -608 +608 @@
             line -= self.classprefs.line_number_offset
             self.showLine(line)
+        if options:
+            self.setViewPositionData(options)
 
     ##### Comment handling

trunk/peppy/plugins/switch_buffers.py

@@ -47 +47 @@
     last_buffer = ""
     
+    # Store options used to restore view state when switching back to a
+    # previous buffer
+    last_options = {}
+    
     def createList(self):
         """Generate list of possible buffer names to complete.
@@ -72 +76 @@
         if text in self.display_names:
             self.__class__.last_buffer = mode.buffer.displayname
+            self.__class__.last_options[mode.buffer.displayname] = mode.getViewPositionData()
             index = self.display_names.index(text)
             url = self.full_names[index]
-            dprint("found %s, switching to %s" % (text, url))
-            wx.CallAfter(self.frame.setBuffer, url)
+            if text in self.__class__.last_options:
+                options = self.__class__.last_options[text]
+            else:
+                options = None
+            dprint("found %s, switching to %s with options %s" % (text, url, options))
+            wx.CallAfter(self.frame.setBuffer, url, options=options)
         else:
             dprint("buffer %s doesn't exist" % text)