Merge lp:~stephen-j-boddy/terminator/bugfix-lp-1017230 into lp:terminator/trunk

[Stephen Boddy]

Well this was a bit of a bugger! Some unpleasant interaction between the rotation code and my optimisation work meant that this was tricky to isolate and correctly fix. So now dragging works, and rotating the terms remembers the ratios too.

[lp:~stephen-j-boddy/terminator/bugfix-lp-1017230]

1311. By Stephen Boddy on 2012-06-25

Spotted some unevenness in the initial position of new splits. This fixes it to 50:50

[Stephen Boddy (stephen-j-boddy)]

Found some oddness with redistribute. I suspect bugfix-lp-1017230, rev 1311. Until I fix it please hold off on:
- feature-redistribute-terms
- bugfix-lp-1017230

[Stephen Boddy (stephen-j-boddy)]

I think this is mostly good to go now. The oddness is mostly gone with lp:~stephen-j-boddy/terminator/feature-redistribute-terms rev 1311.

[Chris Jones (cmsj)]

Looks good, thanks!

review: Approve

=== modified file 'terminatorlib/paned.py'
--- terminatorlib/paned.py	2012-04-04 15:48:29 +0000
+++ terminatorlib/paned.py	2012-06-25 18:03:17 +0000
@@ -43,6 +43,8 @@
             container = VPaned()
         else:
             container = HPaned()
+        
+        self.get_toplevel().set_pos_by_ratio = True
 
         if not sibling:
             sibling = self.maker.make('terminal')
@@ -60,6 +62,11 @@
             container.add(terminal)
 
         self.show_all()
+        
+        while gtk.events_pending():
+            gtk.main_iteration_do(False)
+        self.get_toplevel().set_pos_by_ratio = False
+
 
     def add(self, widget, metadata=None):
         """Add a widget to the container"""
@@ -275,6 +282,12 @@
             container.add(child)
 
     def new_size(self, widget, allocation):
+        if self.get_toplevel().set_pos_by_ratio:
+            self.set_position_by_ratio()
+        else:
+            self.set_position(self.get_position())
+    
+    def set_position_by_ratio(self):
         self.set_pos(int(self.ratio*self.get_length()))
 
     def set_position(self, pos):
 
=== modified file 'terminatorlib/window.py'
--- terminatorlib/window.py	2012-04-19 10:06:26 +0000
+++ terminatorlib/window.py	2012-06-25 18:03:17 +0000
@@ -37,6 +37,7 @@
     losefocus_time = 0
     position = None
     ignore_startup_show = None
+    set_pos_by_ratio = None
 
     zoom_data = None
 
@@ -418,6 +419,8 @@
             container = maker.make('VPaned')
         else:
             container = maker.make('HPaned')
+        
+        self.set_pos_by_ratio = True
 
         if not sibling:
             sibling = maker.make('Terminal')
@@ -433,6 +436,11 @@
         for term in order:
             container.add(term)
         container.show_all()
+        
+        while gtk.events_pending():
+            gtk.main_iteration_do(False)
+        self.set_pos_by_ratio = False
+
 
     def zoom(self, widget, font_scale=True):
         """Zoom a terminal widget"""
@@ -479,6 +487,7 @@
 
     def rotate(self, widget, clockwise):
         """Rotate children in this window"""
+        self.set_pos_by_ratio = True
         maker = Factory()
         # collect all paned children in breadth-first order
         paned = []
@@ -494,6 +503,10 @@
             p.rotate(widget, clockwise)
         self.show_all()
         widget.grab_focus()
+        
+        while gtk.events_pending():
+            gtk.main_iteration_do(False)
+        self.set_pos_by_ratio = False
 
     def get_visible_terminals(self):
         """Walk down the widget tree to find all of the visible terminals.