Updated drawing of tabs in TabBar. It will no longer show "..." when not

needed.
With this update is also possible implement showing "new tab" button
after the last tab

bin/themes/chrome/linux.css

@@ -7,6 +7,5 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     max-height: 26px;
 }

bin/themes/chrome/main.css

@@ -98,9 +98,9 @@
 }
 
 /*TabWidget*/
-#tabwidget::tab-bar
+#tabbar::scroller
 {
-    right: 31px;
+    width: 0px;
 }
 
 #tabwidget-button-opentabs

bin/themes/chrome/windows.css

@@ -9,7 +9,6 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     height: 26px;
 }
 

bin/themes/default/main.css

@@ -98,7 +98,6 @@
 /*TabWidget*/
 #tabbar::tab
 {
-    max-width:250px;
     max-height: 28px;
 }
 
@@ -108,9 +107,9 @@
     qproperty-fixedsize: 20px 27px;
 }
 
-#tabwidget::tab-bar
+#tabbar::scroller
 {
-    right: 20px;
+    width: 0px;
 }
 
 #tabwidget-button-opentabs::menu-indicator

bin/themes/linux/main.css

@@ -61,13 +61,12 @@
 /*TabWidget*/
 #tabbar::tab
 {
-    max-width:250px;
     max-height: 26px;
 }
 
-#tabwidget::tab-bar
+#tabbar::scroller
 {
-    right: 20px;
+    width: 0px;
 }
 
 #tabwidget-button-opentabs

bin/themes/mac/linux.css

@@ -7,6 +7,5 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     max-height: 26px;
 }

bin/themes/mac/main.css

@@ -93,9 +93,9 @@
 }
 
 /*TabWidget*/
-#tabwidget::tab-bar
+#tabbar::scroller
 {
-    right: 26px;
+    width: 0px;
 }
 
 #tabwidget-button-opentabs

bin/themes/mac/windows.css

@@ -9,7 +9,6 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     height: 26px;
 }
 

bin/themes/windows/linux.css

@@ -7,6 +7,5 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     max-height: 26px;
 }

bin/themes/windows/main.css

@@ -103,9 +103,9 @@
 }
 
 /*TabWidget*/
-#tabwidget::tab-bar
+#tabbar::scroller
 {
-    right: 17px;
+    width: 0px;
 }
 
 #tabwidget-button-opentabs

bin/themes/windows/windows.css

@@ -9,7 +9,6 @@
 
 #tabbar::tab
 {
-    max-width: 250px;
     height: 26px;
 }
 

src/webview/tabbar.cpp

@@ -20,11 +20,22 @@
 #include "qupzilla.h"
 #include "webtab.h"
 #include "iconprovider.h"
+#include "toolbutton.h"
 
-TabBar::TabBar(QupZilla* mainClass, QWidget* parent) :
+#define MAXIMUM_TAB_WIDTH 250
-    QTabBar(parent)
+#define MINIMUM_TAB_WIDTH 50
+#ifdef Q_WS_WIN
+#define PINNED_TAB_WIDTH 38
+#else
+#define PINNED_TAB_WIDTH 31
+#endif
+
+TabBar::TabBar(QupZilla* mainClass, QWidget* parent)
+    : QTabBar(parent)
     , p_QupZilla(mainClass)
+    , m_tabWidget((TabWidget*)parentWidget())
     , m_clickedTab(0)
+    , m_pinnedTabsCount(0)
 {
     setObjectName("tabbar");
     setContextMenuPolicy(Qt::CustomContextMenu);
@@ -34,6 +45,8 @@ TabBar::TabBar(QupZilla* mainClass, QWidget* parent) :
     loadSettings();
 
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenuRequested(const QPoint &)));
+    connect(m_tabWidget, SIGNAL(pinnedTabClosed()), this, SLOT(pinnedTabClosed()));
+    connect(m_tabWidget, SIGNAL(pinnedTabAdded()), this, SLOT(pinnedTabAdded()));
 }
 
 void TabBar::loadSettings()
@@ -53,15 +66,11 @@ void TabBar::contextMenuRequested(const QPoint &position)
     int index = tabAt(position);
     m_clickedTab = index;
 
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
-    if (!tabWidget)
-        return;
-
     QMenu menu;
     menu.addAction(QIcon(":/icons/menu/popup.png"),tr("&New tab"), p_QupZilla, SLOT(addTab()));
     menu.addSeparator();
     if (index!=-1) {
-        WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(m_clickedTab));
+        WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(m_clickedTab));
         if (!webTab)
             return;
         if (p_QupZilla->weView(m_clickedTab)->isLoading())
@@ -72,23 +81,23 @@ void TabBar::contextMenuRequested(const QPoint &position)
         menu.addAction(tr("&Duplicate Tab"), this, SLOT(duplicateTab()));
         menu.addAction(webTab->isPinned() ? tr("Un&pin Tab") : tr("&Pin Tab"), this, SLOT(pinTab()));
         menu.addSeparator();
-        menu.addAction(tr("Re&load All Tabs"), tabWidget, SLOT(reloadAllTabs()));
+        menu.addAction(tr("Re&load All Tabs"), m_tabWidget, SLOT(reloadAllTabs()));
         menu.addAction(tr("&Bookmark This Tab"), this, SLOT(bookmarkTab()));
         menu.addAction(tr("Bookmark &All Tabs"), p_QupZilla, SLOT(bookmarkAllTabs()));
         menu.addSeparator();
         QAction* action = p_QupZilla->actionRestoreTab();
-        tabWidget->canRestoreTab() ? action->setEnabled(true) : action->setEnabled(false);
+        m_tabWidget->canRestoreTab() ? action->setEnabled(true) : action->setEnabled(false);
         menu.addAction(action);
         menu.addSeparator();
         menu.addAction(tr("Close Ot&her Tabs"), this, SLOT(closeAllButCurrent()));
         menu.addAction(QIcon::fromTheme("window-close"),tr("Cl&ose"), this, SLOT(closeTab()));
         menu.addSeparator();
     } else {
-        menu.addAction(tr("Reloa&d All Tabs"), tabWidget, SLOT(reloadAllTabs()));
+        menu.addAction(tr("Reloa&d All Tabs"), m_tabWidget, SLOT(reloadAllTabs()));
         menu.addAction(tr("Bookmark &All Ta&bs"), p_QupZilla, SLOT(bookmarkAllTabs()));
         menu.addSeparator();
-        QAction* action = menu.addAction(QIcon::fromTheme("user-trash"),tr("Restore &Closed Tab"), tabWidget, SLOT(restoreClosedTab()));
+        QAction* action = menu.addAction(QIcon::fromTheme("user-trash"),tr("Restore &Closed Tab"), m_tabWidget, SLOT(restoreClosedTab()));
-        tabWidget->canRestoreTab() ? action->setEnabled(true) : action->setEnabled(false);
+        m_tabWidget->canRestoreTab() ? action->setEnabled(true) : action->setEnabled(false);
     }
 
     //Prevent choosing first option with double rightclick
@@ -101,15 +110,25 @@ void TabBar::contextMenuRequested(const QPoint &position)
 QSize TabBar::tabSizeHint(int index) const
 {
     QSize size = QTabBar::tabSizeHint(index);
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
+    WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(index));
-    if (tabWidget) {
+
-        WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(index));
+    if (webTab && webTab->isPinned()) {
-        if (webTab && webTab->isPinned())
+        size.setWidth(PINNED_TAB_WIDTH);
-#ifdef Q_WS_WIN
+    } else {
-            size.setWidth(38);
+        int availableWidth = width() - (PINNED_TAB_WIDTH * m_pinnedTabsCount) - m_tabWidget->buttonListTabs()->width();
-#else
+        int normalTabsCount = count() - m_pinnedTabsCount;
-            size.setWidth(31);
+        if (availableWidth >= MAXIMUM_TAB_WIDTH * normalTabsCount)
-#endif
+            size.setWidth(MAXIMUM_TAB_WIDTH);
+        else if (availableWidth < MINIMUM_TAB_WIDTH * normalTabsCount)
+            size.setWidth(MINIMUM_TAB_WIDTH);
+        else {
+            int maxWidthForTab = availableWidth / normalTabsCount;
+            //Fill any empty space (gotten from rounding) with last tab
+            if (index == count() - 1)
+                size.setWidth( (availableWidth - maxWidthForTab * normalTabsCount) + maxWidthForTab);
+            else
+                size.setWidth(maxWidthForTab);
+        }
     }
     return size;
 }
@@ -131,11 +150,8 @@ void TabBar::tabInserted(int index)
 
 void TabBar::showCloseButton(int index)
 {
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
-    if (!tabWidget)
-        return;
 
-    WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(index));
+    WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(index));
     if (webTab && webTab->isPinned())
         return;
 
@@ -161,11 +177,7 @@ void TabBar::updateCloseButton(int index)
     if (!button)
         return;
 
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
+    WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(index));
-    if (!tabWidget)
-        return;
-
-    WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(index));
     if (webTab && webTab->isPinned())
         button->hide();
     else
@@ -175,10 +187,10 @@ void TabBar::updateCloseButton(int index)
 void TabBar::closeCurrentTab()
 {
     int id = currentIndex();
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
+    if (id < 0)
-    if (!tabWidget || id < 0)
         return;
-    tabWidget->closeTab(id);
+
+    m_tabWidget->closeTab(id);
 }
 
 void TabBar::bookmarkTab()
@@ -188,24 +200,32 @@ void TabBar::bookmarkTab()
 
 void TabBar::pinTab()
 {
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
+    WebTab* webTab = qobject_cast<WebTab*>(m_tabWidget->widget(m_clickedTab));
-    if (!tabWidget)
-        return;
-
-    WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(m_clickedTab));
     if (!webTab)
         return;
 
     webTab->pinTab(m_clickedTab);
+
+    if (webTab->isPinned())
+        m_pinnedTabsCount++;
+    else
+        m_pinnedTabsCount--;
+}
+
+void TabBar::pinnedTabClosed()
+{
+    m_pinnedTabsCount--;
+}
+
+void TabBar::pinnedTabAdded()
+{
+    m_pinnedTabsCount++;
 }
 
 void TabBar::mouseDoubleClickEvent(QMouseEvent* event)
 {
-    TabWidget* tabWidget = qobject_cast<TabWidget*>(parentWidget());
-    if (!tabWidget)
-        return;
     if (event->button() == Qt::LeftButton && tabAt(event->pos()) == -1) {
-        tabWidget->addView(QUrl(),tr("New tab"), TabWidget::NewTab, true);
+        m_tabWidget->addView(QUrl(),tr("New tab"), TabWidget::NewTab, true);
         return;
     }
     QTabBar::mouseDoubleClickEvent(event);

src/webview/tabbar.h

@@ -27,6 +27,7 @@
 #include <QSettings>
 
 class QupZilla;
+class TabWidget;
 class TabBar : public QTabBar
 {
     Q_OBJECT
@@ -52,6 +53,9 @@ signals:
 public slots:
 
 private slots:
+    void pinnedTabAdded();
+    void pinnedTabClosed();
+
     void contextMenuRequested(const QPoint &position);
     void reloadTab() { emit reloadTab(m_clickedTab); }
     void stopTab() { emit stopTab(m_clickedTab); }
@@ -70,9 +74,13 @@ private:
 //    void tabInserted(int index);
 
     QupZilla* p_QupZilla;
+    TabWidget* m_tabWidget;
+
     bool m_showCloseButtonWithOneTab;
     bool m_showTabBarWithOneTab;
+
     int m_clickedTab;
+    int m_pinnedTabsCount;
 
 };
 

src/webview/tabwidget.cpp

@@ -106,7 +106,7 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent) :
   , m_locationBars(new QStackedWidget())
 {
     setObjectName("tabwidget");
-    m_tabBar = new TabBar(p_QupZilla);
+    m_tabBar = new TabBar(p_QupZilla, this);
     setTabBar(m_tabBar);
 
     connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
@@ -259,7 +259,7 @@ int TabWidget::addView(QUrl url, const QString &title, OpenUrlIn openIn, bool se
 
 void TabWidget::setTabText(int index, const QString& text)
 {
-    QString newtext = text + "                                                                            ";
+    QString newtext = text;
 
     if (WebTab* webTab = qobject_cast<WebTab*>(p_QupZilla->tabWidget()->widget(index)) ) {
         if (webTab->isPinned())
@@ -279,9 +279,10 @@ void TabWidget::closeTab(int index)
     if (!webView)
         return;
 
+    if (webView->webTab()->isPinned())
+        emit pinnedTabClosed();
+
     m_locationBars->removeWidget(webView->webTab()->locationBar());
-//        disconnect(weView(index), SIGNAL(siteIconChanged()), p_QupZilla->locationBar(), SLOT(siteIconChanged()));
-//        disconnect(weView(index), SIGNAL(showUrl(QUrl)), p_QupZilla->locationBar(), SLOT(showUrl(QUrl)));
     disconnect(webView, SIGNAL(wantsCloseTab(int)), this, SLOT(closeTab(int)));
     disconnect(webView, SIGNAL(changed()), mApp, SLOT(setStateChanged()));
     disconnect(webView, SIGNAL(ipChanged(QString)), p_QupZilla->ipLabel(), SLOT(setText(QString)));
@@ -497,8 +498,10 @@ void TabWidget::restorePinnedTabs()
             addedIndex = addView(url);
         }
         WebTab* webTab = (WebTab*)widget(addedIndex);
-        if (webTab)
+        if (webTab) {
             webTab->setPinned(true);
+            emit pinnedTabAdded();
+        }
 
         m_tabBar->moveTab(addedIndex, i);
         m_tabBar->updateCloseButton(i);

src/webview/tabwidget.h

@@ -59,6 +59,9 @@ public:
     QStackedWidget* locationBars() { return m_locationBars; }
     ToolButton* buttonListTabs() { return m_buttonListTabs; }
 
+signals:
+    void pinnedTabClosed();
+    void pinnedTabAdded();
 
 public slots:
     void closeTab(int index=-1);

src/webview/webinspectordockwidget.cpp

@@ -6,7 +6,7 @@
 #include "qupzilla.h"
 
 WebInspectorDockWidget::WebInspectorDockWidget(QupZilla* mainClass)
-    : QDockWidget()
+    : QDockWidget(mainClass)
     , p_QupZilla(mainClass)
     , m_inspector(0)
 {