From b0b8b576f6dad9c62e6e8fa3e841f251f6c60494 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Thu, 1 Aug 2013 17:30:18 +0200
Subject: [PATCH] A little adjustment to prevent messy tabs when tabs are not
 homogenous

---
 terminatorlib/preferences.glade | 19 ++++++++-----------
 terminatorlib/prefseditor.py    |  7 +++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/terminatorlib/preferences.glade b/terminatorlib/preferences.glade
index 8d73bb32..2ea00344 100644
--- a/terminatorlib/preferences.glade
+++ b/terminatorlib/preferences.glade
@@ -810,8 +810,8 @@
                             <property name="label" translatable="yes">Tabs scroll buttons</property>
                           </object>
                           <packing>
-                            <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
+                            <property name="top_attach">7</property>
+                            <property name="bottom_attach">8</property>
                           </packing>
                         </child>
                         <child>
@@ -820,16 +820,14 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.55000001192092896</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="on_scroll_toggled" swapped="no"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">6</property>
-                            <property name="bottom_attach">7</property>
+                            <property name="top_attach">7</property>
+                            <property name="bottom_attach">8</property>
                             <property name="x_options">GTK_EXPAND</property>
                             <property name="y_options">GTK_EXPAND</property>
                           </packing>
@@ -841,8 +839,8 @@
                             <property name="label" translatable="yes">Tabs homogeneous</property>
                           </object>
                           <packing>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
                           </packing>
                         </child>
                         <child>
@@ -851,7 +849,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_action_appearance">False</property>
-                            <property name="xalign">0</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <signal name="toggled" handler="on_homogeneous_toggled" swapped="no"/>
@@ -859,8 +856,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">7</property>
-                            <property name="bottom_attach">8</property>
+                            <property name="top_attach">6</property>
+                            <property name="bottom_attach">7</property>
                             <property name="x_options">GTK_EXPAND</property>
                             <property name="y_options">GTK_EXPAND</property>
                           </packing>
diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py
index b0843a9e..9c1cf150 100755
--- a/terminatorlib/prefseditor.py
+++ b/terminatorlib/prefseditor.py
@@ -567,7 +567,14 @@ class PrefsEditor:
 
     def on_homogeneous_toggled(self, widget):
         """homogeneous_tabbar setting changed"""
+        guiget = self.builder.get_object
         self.config['homogeneous_tabbar'] = widget.get_active()
+        scroll_toggled = guiget('scrolltabbarcheck')
+        if widget.get_active():
+            scroll_toggled.set_sensitive(True)
+        else:
+            scroll_toggled.set_active(True)
+            scroll_toggled.set_sensitive(False)
         self.config.save()
 
     def on_scroll_toggled(self, widget):