# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1398622327 -7200
# Node ID 834f6e604dc3a6067ca6e4e44fc81f4aa09a6d1f
# Parent  fac35875f6eb7011d7a42bced12096dcb3060a61
use defaults size for tab heights in editor and doc widget (bug #42144)

* file-editor.cc (notice_settings): do not change the max height in style sheet

* webinfo.cc (constructor): do not change the max height of the tabs

diff -r fac35875f6eb -r 834f6e604dc3 libgui/src/m-editor/file-editor.cc
--- a/libgui/src/m-editor/file-editor.cc	Sun Apr 27 19:36:54 2014 +0200
+++ b/libgui/src/m-editor/file-editor.cc	Sun Apr 27 20:12:07 2014 +0200
@@ -1030,22 +1030,18 @@
   int tab_width_max = settings->value ("editor/notebook_tab_width_max", 300)
                                       .toInt ();
 
-  QString style_sheet;
   if (settings->value ("editor/longWindowTitle", false).toBool ())
     {
-      style_sheet = QString ("QTabBar::tab {max-height: 4ex; "
-                             "min-width: %1px; max-width: %2px;}")
+      QString style_sheet = QString ("QTabBar::tab "
+                                     "{min-width: %1px; max-width: %2px;}")
                              .arg (tab_width_min).arg (tab_width_max);
       _tab_widget->setElideMode (Qt::ElideLeft);
+      _tab_widget->setStyleSheet (style_sheet);
     }
   else
-    {
-      style_sheet = QString ("QTabBar::tab {max-height: 4ex;}");
-      _tab_widget->setElideMode (Qt::ElideNone);
-    }
+    _tab_widget->setElideMode (Qt::ElideNone);
 
   _tab_widget->setUsesScrollButtons (true);
-  _tab_widget->setStyleSheet (style_sheet);
 
   set_shortcuts ();
 
diff -r fac35875f6eb -r 834f6e604dc3 libgui/src/qtinfo/webinfo.cc
--- a/libgui/src/qtinfo/webinfo.cc	Sun Apr 27 19:36:54 2014 +0200
+++ b/libgui/src/qtinfo/webinfo.cc	Sun Apr 27 20:12:07 2014 +0200
@@ -60,7 +60,6 @@
 #ifdef HAVE_QTABWIDGET_SETMOVABLE
   _tab_bar->setMovable (true);
 #endif
-  _tab_bar->setStyleSheet ("QTabBar::tab {max-height: 4ex; }");
   hbox_layout->addWidget (_tab_bar);
 
   _zoom_in_button = new QToolButton (this);