From 6ac67768e7bd0c98d74c119f434774c7a6614665 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Wed, 2 Dec 2015 21:12:52 +0100
Subject: [PATCH] Fix scrollbar position on current terminals when changed in
 prefs

---
 terminatorlib/terminal.py | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py
index f9b86a35..6dfbd6a2 100755
--- a/terminatorlib/terminal.py
+++ b/terminatorlib/terminal.py
@@ -86,7 +86,6 @@ class Terminal(gtk.VBox):
     vte = None
     terminalbox = None
     scrollbar = None
-    scrollbar_position = None
     titlebar = None
     searchbar = None
 
@@ -244,19 +243,9 @@ class Terminal(gtk.VBox):
 
         terminalbox = gtk.HBox()
         self.scrollbar = gtk.VScrollbar(self.vte.get_adjustment())
-        self.scrollbar.set_no_show_all(True)
-        self.scrollbar_position = self.config['scrollbar_position']
 
-        if self.scrollbar_position not in ('hidden', 'disabled'):
-            self.scrollbar.show()
-
-        if self.scrollbar_position == 'left':
-            func = terminalbox.pack_end
-        else:
-            func = terminalbox.pack_start
-
-        func(self.vte)
-        func(self.scrollbar, False)
+        terminalbox.pack_start(self.vte, True, True, 0)
+        terminalbox.pack_start(self.scrollbar, False, True, 0)
         terminalbox.show_all()
 
         return(terminalbox)
@@ -792,16 +781,14 @@ class Terminal(gtk.VBox):
         self.vte.set_scroll_on_keystroke(self.config['scroll_on_keystroke'])
         self.vte.set_scroll_on_output(self.config['scroll_on_output'])
 
-        if self.scrollbar_position != self.config['scrollbar_position']:
-            self.scrollbar_position = self.config['scrollbar_position']
-            if self.config['scrollbar_position'] in ['disabled', 'hidden']:
-                self.scrollbar.hide()
-            else:
-                self.scrollbar.show()
-                if self.config['scrollbar_position'] == 'left':
-                    self.reorder_child(self.scrollbar, 0)
-                elif self.config['scrollbar_position'] == 'right':
-                    self.reorder_child(self.vte, 0)
+        if self.config['scrollbar_position'] in ['disabled', 'hidden']:
+            self.scrollbar.hide()
+        else:
+            self.scrollbar.show()
+            if self.config['scrollbar_position'] == 'left':
+                self.terminalbox.reorder_child(self.scrollbar, 0)
+            elif self.config['scrollbar_position'] == 'right':
+                self.terminalbox.reorder_child(self.vte, 0)
 
         if hasattr(self.vte, 'set_alternate_screen_scroll'):
             self.vte.set_alternate_screen_scroll(