Gui: Move more button to the end WB TabBar

This changes back placement of the "more" button of the WB TabBar to be
at the end, where it should be naturally placed. In order to ensure that
it is always visible the control was reworked to show this button always
after the tab bar widget which now is dynamically sized. This is
behavior that is well known from browsers.

This commit also ensures that active workbench is always visible in the
TabBar by adding additional temporary tab when necessary. This tab will
automatically dissapear when not needed.

Fixes: FreeCAD#13720
Fixes: FreeCAD#13630

src/Gui/WorkbenchSelector.cpp

@@ -29,6 +29,7 @@
 # include <QApplication>
 # include <QScreen>
 # include <QToolBar>
+# include <QLayout>
 #endif
 
 #include "Action.h"
@@ -99,29 +100,30 @@ void WorkbenchComboBox::refreshList(QList<QAction*> actionList)
 
 
 WorkbenchTabWidget::WorkbenchTabWidget(WorkbenchGroup* aGroup, QWidget* parent)
-    : QTabBar(parent)
+    : QWidget(parent)
     , wbActionGroup(aGroup)
 {
     setToolTip(aGroup->toolTip());
     setStatusTip(aGroup->action()->statusTip());
     setWhatsThis(aGroup->action()->whatsThis());
+    setObjectName(QString::fromLatin1("WbTabBar"));
 
-    QAction* moreAction = new QAction(this);
-    menu = new QMenu(this);
-    moreAction->setMenu(menu);
-    connect(moreAction, &QAction::triggered, [this]() {
-        menu->popup(QCursor::pos());
-    });
-    connect(menu, &QMenu::aboutToHide, this, [this]() {
-        // if the more tab did not triggered a disabled workbench, make sure we reselect the correct tab.
-        std::string activeWbName = WorkbenchManager::instance()->activeName();
-        for (int i = 0; i < count(); ++i) {
-            if (wbActionGroup->actions()[i]->objectName().toStdString() == activeWbName) {
-                setCurrentIndex(i + 1);
-                break;
-            }
-        }
-    });
+    tabBar = new QTabBar(this);
+    moreButton = new QToolButton(this);
+
+    auto layout = new QHBoxLayout(this);
+
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(tabBar);
+    layout->addWidget(moreButton);
+
+    setLayout(layout);
+
+    moreButton->setIcon(Gui::BitmapFactory().iconFromTheme("list-add"));
+    moreButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    moreButton->setPopupMode(QToolButton::InstantPopup);
+    moreButton->setMenu(new QMenu(moreButton));
+    moreButton->setObjectName(QString::fromLatin1("WbTabBarMore"));
 
     if (parent->inherits("QToolBar")) {
         // set the initial orientation. We cannot do updateLayoutAndTabOrientation(false);
@@ -130,33 +132,47 @@ WorkbenchTabWidget::WorkbenchTabWidget(WorkbenchGroup* aGroup, QWidget* parent)
         hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Workbenches");
         std::string orientation = hGrp->GetASCII("TabBarOrientation", "North");
 
-        this->setShape(orientation == "North" ? QTabBar::RoundedNorth :
+        tabBar->setShape(orientation == "North" ? QTabBar::RoundedNorth :
             orientation == "South" ? QTabBar::RoundedSouth :
             orientation == "East" ? QTabBar::RoundedEast :
             QTabBar::RoundedWest);
     }
 
-    setDocumentMode(true);
-    setUsesScrollButtons(true);
-    setDrawBase(true);
-    setObjectName(QString::fromLatin1("WbTabBar"));
-    setIconSize(QSize(16, 16));
+    tabBar->setDocumentMode(true);
+    tabBar->setUsesScrollButtons(true);
+    tabBar->setDrawBase(true);
+    tabBar->setIconSize(QSize(16, 16));
 
     refreshList(aGroup->getEnabledWbActions());
+
     connect(aGroup, &WorkbenchGroup::workbenchListRefreshed, this, &WorkbenchTabWidget::refreshList);
-    connect(aGroup->groupAction(), &QActionGroup::triggered, this, [this, aGroup](QAction* action) {
-        int index = aGroup->actions().indexOf(action) + 1;
-        if (index > this->count() - 1) {
-            index = 0;
+    connect(aGroup->groupAction(), &QActionGroup::triggered, this, [this](QAction* action) {
+        if (wbActionGroup->getDisabledWbActions().contains(action)) {
+            if (additionalWorkbenchAction == action) {
+                return;
+            }
+
+            if (additionalWorkbenchAction) {
+                tabBar->removeTab(tabBar->count() - 1);
+            }
+
+            additionalWorkbenchAction = action;
+
+            addWorkbenchTab(action);
+            tabBar->setCurrentIndex(tabBar->count() - 1);
+
+            return;
         }
-        setCurrentIndex(index);
+
+        tabBar->setCurrentIndex(actionToTabIndex[action]);
     });
-    connect(this, qOverload<int>(&QTabBar::tabBarClicked), aGroup, [aGroup, moreAction](int index) {
-        if(index == 0) {
-            moreAction->trigger();
-        }
-        else if (index <= aGroup->getEnabledWbActions().size()) {
-            aGroup->actions()[index - 1]->trigger();
+
+    connect(tabBar, qOverload<int>(&QTabBar::currentChanged), aGroup, [this](int index) {
+        tabIndexToAction[index]->trigger();
+
+        if (index != tabBar->count() - 1 && additionalWorkbenchAction) {
+            tabBar->removeTab(tabBar->count() - 1);
+            additionalWorkbenchAction = nullptr;
         }
     });
 
@@ -169,41 +185,47 @@ WorkbenchTabWidget::WorkbenchTabWidget(WorkbenchGroup* aGroup, QWidget* parent)
 
 void WorkbenchTabWidget::refreshList(QList<QAction*> actionList)
 {
+    actionToTabIndex.clear();
+
     // tabs->clear() (QTabBar has no clear)
-    for (int i = count() - 1; i >= 0; --i) {
-        removeTab(i);
+    for (int i = tabBar->count() - 1; i >= 0; --i) {
+        tabBar->removeTab(i);
+    }
+
+    for (QAction* action : actionList) {
+        addWorkbenchTab(action);
     }
 
+    if (additionalWorkbenchAction != nullptr) {
+        addWorkbenchTab(additionalWorkbenchAction);
+    }
+
+    buildPrefMenu();
+}
+
+void WorkbenchTabWidget::addWorkbenchTab(QAction* action)
+{
     ParameterGrp::handle hGrp;
     hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Workbenches");
     int itemStyleIndex = hGrp->GetInt("WorkbenchSelectorItem", 0);
 
-    QIcon icon = Gui::BitmapFactory().iconFromTheme("list-add");
-    if (itemStyleIndex == 2) {
-        addTab(QString::fromLatin1("+"));
+    actionToTabIndex[action] = tabBar->count();
+    tabIndexToAction[tabBar->count()] = action;
+
+    QIcon icon = action->icon();
+    if (icon.isNull() || itemStyleIndex == 2) {
+        tabBar->addTab(action->text());
+    }
+    else if (itemStyleIndex == 1) {
+        tabBar->addTab(icon, QString::fromLatin1(""));
     }
     else {
-        addTab(icon, QString::fromLatin1(""));
+        tabBar->addTab(icon, action->text());
     }
 
-    for (QAction* action : actionList) {
-        QIcon icon = action->icon();
-        if (icon.isNull() || itemStyleIndex == 2) {
-            addTab(action->text());
-        }
-        else if (itemStyleIndex == 1) {
-            addTab(icon, QString::fromLatin1(""));
-        }
-        else {
-            addTab(icon, action->text());
-        }
-
-        if (action->isChecked()) {
-            setCurrentIndex(count() - 1);
-        }
+    if (action->isChecked()) {
+        tabBar->setCurrentIndex(tabBar->count() - 1);
     }
-
-    buildPrefMenu();
 }
 
 void WorkbenchTabWidget::updateLayoutAndTabOrientation(bool floating)
@@ -219,21 +241,29 @@ void WorkbenchTabWidget::updateLayoutAndTabOrientation(bool floating)
     Qt::ToolBarArea area = getMainWindow()->toolBarArea(tb);
 
     if (area == Qt::LeftToolBarArea || area == Qt::RightToolBarArea) {
-        setShape(area == Qt::LeftToolBarArea ? QTabBar::RoundedWest : QTabBar::RoundedEast);
+        tabBar->setShape(area == Qt::LeftToolBarArea ? QTabBar::RoundedWest : QTabBar::RoundedEast);
         hGrp->SetASCII("TabBarOrientation", area == Qt::LeftToolBarArea ? "West" : "East");
     }
     else {
-        setShape(area == Qt::TopToolBarArea ? QTabBar::RoundedNorth : QTabBar::RoundedSouth);
+        tabBar->setShape(area == Qt::TopToolBarArea ? QTabBar::RoundedNorth : QTabBar::RoundedSouth);
         hGrp->SetASCII("TabBarOrientation", area == Qt::TopToolBarArea ? "North" : "South");
     }
 }
 
 void WorkbenchTabWidget::buildPrefMenu()
 {
+    auto menu = moreButton->menu();
+
     menu->clear();
 
     // Add disabled workbenches, sorted alphabetically.
-    menu->addActions(wbActionGroup->getDisabledWbActions());
+    for (auto action : wbActionGroup->getDisabledWbActions()) {
+        if (action->text() == QString::fromLatin1("<none>")) {
+            continue;
+        }
+
+        menu->addAction(action);
+    }
 
     menu->addSeparator();
 

src/Gui/WorkbenchSelector.h

@@ -27,7 +27,9 @@
 #include <QComboBox>
 #include <QTabBar>
 #include <QMenu>
+#include <QToolButton>
 #include <FCGlobal.h>
+#include <map>
 
 namespace Gui
 {
@@ -49,7 +51,7 @@ public Q_SLOTS:
 };
 
 
-class GuiExport WorkbenchTabWidget : public QTabBar
+class GuiExport WorkbenchTabWidget : public QWidget
 {
     Q_OBJECT
 
@@ -61,10 +63,17 @@ class GuiExport WorkbenchTabWidget : public QTabBar
 
 public Q_SLOTS:
     void refreshList(QList<QAction*>);
+    void addWorkbenchTab(QAction* workbenchActivateAction);
 
 private:
     WorkbenchGroup* wbActionGroup;
-    QMenu* menu;
+    QToolButton* moreButton;
+    QTabBar* tabBar;
+    // this action is used for workbenches that are typically disabled
+    QAction* additionalWorkbenchAction = nullptr;
+
+    std::map<QAction*, int> actionToTabIndex;
+    std::map<int, QAction*> tabIndexToAction;
 };