Implemented supprt for customdock area title bar buttons

Author: githubuser0xFFFF

demo/MainWindow.cpp

@@ -56,6 +56,7 @@
 #include <QScreen>
 #include <QStyle>
 #include <QMessageBox>
+#include <QMenu>
 
 #ifdef Q_OS_WIN
 #include <QAxWidget>
@@ -129,7 +130,7 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
  */
 static QIcon svgIcon(const QString& File)
 {
-	// This is a workaround, because because in item views SVG icons are not
+	// This is a workaround, because in item views SVG icons are not
 	// properly scaled an look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
@@ -180,6 +181,18 @@ static ads::CDockWidget* createEditorWidget(QMenu* ViewMenu)
 	DockWidget->setIcon(svgIcon(":/adsdemo/images/edit.svg"));
 	DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
 	ViewMenu->addAction(DockWidget->toggleViewAction());
+
+	QMenu* OptionsMenu = new QMenu(DockWidget);
+	OptionsMenu->setTitle(QObject::tr("Options"));
+	OptionsMenu->setToolTip(OptionsMenu->title());
+	OptionsMenu->setIcon(svgIcon(":/adsdemo/images/custom-menu-button.svg"));
+	auto MenuAction = OptionsMenu->menuAction();
+	// The object name of the action will be set for the QToolButton that
+	// is created in the dock area title bar. You can use this name for CSS
+	// styling
+	MenuAction->setObjectName("optionsMenu");
+	DockWidget->setTitleBarActions({OptionsMenu->menuAction()});
+
 	return DockWidget;
 }
 

demo/demo.qrc

@@ -9,5 +9,6 @@
         <file>images/date_range.svg</file>
         <file>images/edit.svg</file>
         <file>images/grid_on.svg</file>
+        <file>images/custom-menu-button.svg</file>
     </qresource>
 </RCC>

demo/images/custom-menu-button.svg

@@ -576,7 +576,6 @@ void CDockAreaTabBar::closeTab(int Index)
 	{
 		return;
 	}
-	//Tab->hide();
 	emit tabCloseRequested(Index);
 }
 
@@ -643,5 +642,6 @@ eDragState CDockAreaTabBar::dragState() const
 
 } // namespace ads
 
+
 //---------------------------------------------------------------------------
 // EOF DockAreaTabBar.cpp

src/DockAreaTabBar.cpp

@@ -70,6 +70,7 @@ struct DockAreaTitleBarPrivate
 	CDockAreaTabBar* TabBar;
 	bool MenuOutdated = true;
 	QMenu* TabsMenu;
+	QList<tTitleBarButton*> DockWidgetActionsButtons;
 
 	/**
 	 * Private data constructor
@@ -188,7 +189,6 @@ void DockAreaTitleBarPrivate::createButtons()
 	_this->connect(TabsMenuButton->menu(), SIGNAL(triggered(QAction*)),
 		SLOT(onTabsMenuActionTriggered(QAction*)));
 
-
 	// Undock button
 	UndockButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasUndockButton));
 	UndockButton->setObjectName("undockButton");
@@ -361,11 +361,39 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 		return;
 	}
 
+	CDockWidget* DockWidget = d->TabBar->tab(Index)->dockWidget();
 	if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
 	{
-		CDockWidget* DockWidget = d->TabBar->tab(Index)->dockWidget();
 		d->CloseButton->setEnabled(DockWidget->features().testFlag(CDockWidget::DockWidgetClosable));
 	}
+
+	if (!d->DockWidgetActionsButtons.isEmpty())
+	{
+		for (auto Button : d->DockWidgetActionsButtons)
+		{
+			d->TopLayout->removeWidget(Button);
+			delete Button;
+		}
+		d->DockWidgetActionsButtons.clear();
+	}
+
+	auto Actions = DockWidget->titleBarActions();
+	if (Actions.isEmpty())
+	{
+		return;
+	}
+
+	int InsertIndex = 2;
+	for (auto Action : Actions)
+	{
+		auto Button = new CTitleBarButton(true, this);
+		Button->setDefaultAction(Action);
+		Button->setAutoRaise(true);
+		Button->setPopupMode(QToolButton::InstantPopup);
+		Button->setObjectName(Action->objectName());
+		d->TopLayout->insertWidget(InsertIndex++, Button, 0);
+		d->DockWidgetActionsButtons.append(Button);
+	}
 }
 
 

src/DockAreaTitleBar.cpp

@@ -80,6 +80,7 @@ struct DockWidgetPrivate
 	QSize ToolBarIconSizeDocked = QSize(16, 16);
 	QSize ToolBarIconSizeFloating = QSize(24, 24);
 	bool IsFloatingTopLevel = false;
+	QList<QAction*> TitleBarActions;
 
 	/**
 	 * Private data constructor
@@ -817,6 +818,20 @@ bool CDockWidget::closeDockWidgetInternal(bool ForceClose)
 }
 
 
+//============================================================================
+void CDockWidget::setTitleBarActions(QList<QAction*> actions)
+{
+	d->TitleBarActions = actions;
+}
+
+
+//============================================================================
+QList<QAction*> CDockWidget::titleBarActions() const
+{
+	return d->TitleBarActions;
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockWidget.cpp

@@ -401,6 +401,22 @@ private slots:
      */
     QSize toolBarIconSize(eState State) const;
 
+    /**
+     * Set the actions that will be shown in the dock area title bar
+     * if this dock widget is the active tab.
+     * You should not add to many actions to the title bar, because this
+     * will remove the available space for the tabs. If you have a number
+     * of actions, just add an action with a menu to show a popup menu
+     * button in the title bar.
+     */
+    void setTitleBarActions(QList<QAction*> actions);
+
+    /**
+     * Returns a list of actions that will be inserted into the dock area title
+     * bar if this dock widget becomes the current widget
+     */
+    virtual QList<QAction*> titleBarActions() const;
+
 
 #ifndef QT_NO_TOOLTIP
     /**