Attachment 446242 Details for Bug 632217 – upstream fix

[patch] upstream fix

kdebase-4.5.1-konsole-reduce-min-tabwidth.patch (text/plain), 1.96 KB, created by Stefan Becker on 2010-09-09 12:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Becker

Created: 2010-09-09 12:53:34 UTC

Size: 1.96 KB

patch

obsolete

>--- trunk/KDE/kdebase/apps/konsole/src/ViewContainer.cpp	2010/07/26 16:35:51	1154986
>+++ trunk/KDE/kdebase/apps/konsole/src/ViewContainer.cpp	2010/09/07 04:17:12	1172362
>@@ -260,6 +260,7 @@
>     , _dropIndicatorIndex(-1)
>     , _drawIndicatorDisabled(false)
> {
>+    setStyleSheet("QTabBar::tab { min-width: 2em; max-width: 25em }");
>     setElideMode(Qt::ElideLeft);
> }
> void ViewContainerTabBar::setDropIndicator(int index, bool drawDisabled)
>@@ -396,30 +397,6 @@
>         event->ignore();
> }
> 
>-/* Try to provide a reasonable tab width:
>- * If there are less than 5 tabs, let the tabs fill out the tabbar.
>- * Otherwise, check the tab text size and the minimumTabWidth value.
>- * The minimumTabWidth is to prevent the tabs from getting too
>- * small such that no scroll indicators will appear.
>-*/
>-QSize ViewContainerTabBar::tabSizeHint(int index) const
>-{
>-    const int fillTabCount = 5;
>-    const int minimumTabWidth = 150; // Arbitrary value
>-    int tabBarWidth = rect().width();
>-    int tabCount = count();
>-    int tabMaxWidth;
>-    if (tabCount <= fillTabCount)
>-        tabMaxWidth = tabBarWidth / (tabCount + 0.5);
>-    else
>-        tabMaxWidth = tabBarWidth / (fillTabCount + 0.5);
>-
>-    int tabTextWidth = fontMetrics().width(tabText(index));
>-    // qBound ( minimum, value, max )
>-    QSize size (qBound(minimumTabWidth, tabTextWidth, tabMaxWidth),
>-                QTabBar::tabSizeHint(index).height());
>-    return size;
>-}
> QPixmap ViewContainerTabBar::dragDropPixmap(int tab) 
> {
>     Q_ASSERT(tab >= 0 && tab < count());
>--- trunk/KDE/kdebase/apps/konsole/src/ViewContainer.h	2010/07/10 15:07:21	1148412
>+++ trunk/KDE/kdebase/apps/konsole/src/ViewContainer.h	2010/09/07 04:17:12	1172362
>@@ -351,7 +351,6 @@
>     QPixmap dragDropPixmap(int tab);
> 
> protected:
>-    virtual QSize tabSizeHint(int index) const;
>     virtual void dragEnterEvent(QDragEnterEvent* event);
>     virtual void dragLeaveEvent(QDragLeaveEvent* event);
>     virtual void dragMoveEvent(QDragMoveEvent* event);

Actions: View | Diff

Attachments on bug 632217: 446242 | 446414