Revert Guake#885 to the old fixed-width tabs behavior. Partial fix for …

…Guake#962 and Guake#981
welkinspring · Aug 20, 2017 · 29f6f32 · 29f6f32
1 parent 7bbc17c
commit 29f6f32
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 10 deletions.
diff --git a/data/guake.glade b/data/guake.glade
@@ -399,27 +399,49 @@
             <property name="extension_events">all</property>
             <property name="no_show_all">True</property>
             <child>
-              <widget class="GtkEventBox" id="event-tabs">
+              <widget class="GtkScrolledWindow" id="tabs-scrolledwindow">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">never</property>
                 <property name="can_focus">False</property>
                 <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
                 <child>
-                  <widget class="GtkHBox" id="hbox-tabs">
-                    <property name="homogeneous">True</property>
+                  <widget class="GtkViewport" id="tabs-viewport">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="shadow_type">none</property>
                     <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
+                      <widget class="GtkEventBox" id="event-tabs">
+                        <property name="height_request">10</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox-tabs">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
                     </child>
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="button1">

diff --git a/src/guake/guake_app.py b/src/guake/guake_app.py
@@ -299,6 +299,23 @@ def scroll_manager(hbox, event):
         self.abbreviate = False
         self.was_deleted_tab = False
 
+        def tabs_scrollbar_hide(hscrollbar):
+            self.get_widget('event-tabs').set_property('height_request', 10)
+            if self.abbreviate and self.was_deleted_tab:
+                self.was_deleted_tab = False
+                self.abbreviate = False
+                self.recompute_tabs_titles()
+
+        def tabs_scrollbar_show(hscrollbar):
+            self.get_widget('event-tabs').set_property('height_request', -1)
+            if self.client.get_bool(KEY("/general/abbreviate_tab_names")):
+                self.abbreviate = True
+                self.recompute_tabs_titles()
+
+        tabs_scrollbar = self.get_widget('tabs-scrolledwindow').get_hscrollbar()
+        tabs_scrollbar.connect('hide', tabs_scrollbar_hide)
+        tabs_scrollbar.connect('show', tabs_scrollbar_show)
+
         # Flag to prevent guake hide when window_losefocus is true and
         # user tries to use the context menu.
         self.showing_context_menu = False