From c4872c6b102e2de0b426544da6d2e5c3f98cb70d Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Fri, 7 Feb 2020 14:29:02 +0100
Subject: [PATCH] Added showcase for custom title bar widget to demo
 application

---
 demo/MainWindow.cpp      |  28 ++++++++-
 demo/demo.qrc            |   1 +
 demo/images/plus.svg     | 123 +++++++++++++++++++++++++++++++++++++++
 src/DockAreaTitleBar.cpp |   2 +-
 src/DockAreaWidget.cpp   |   7 +++
 src/DockAreaWidget.h     |   6 ++
 6 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 demo/images/plus.svg

diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index 922530a..518e76f 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -57,6 +57,8 @@
 #include <QStyle>
 #include <QMessageBox>
 #include <QMenu>
+#include <QToolButton>
+
 
 #ifdef Q_OS_WIN
 #include <QAxWidget>
@@ -68,6 +70,8 @@
 #include "DockManager.h"
 #include "DockWidget.h"
 #include "DockAreaWidget.h"
+#include "DockAreaTitleBar.h"
+#include "DockAreaTabBar.h"
 #include "FloatingDockContainer.h"
 
 
@@ -315,10 +319,32 @@ void MainWindowPrivate::createContent()
 	FileSystemWidget->setFeature(ads::CDockWidget::DockWidgetFloatable, false);
 	appendFeaturStringToWindowTitle(FileSystemWidget);
 	auto TopDockArea = DockManager->addDockWidget(ads::TopDockWidgetArea, FileSystemWidget);
+
+	// We create a calender widget and clear all flags to prevent the dock area
+	// from closing
 	DockWidget = createCalendarDockWidget(ViewMenu);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetClosable, false);
+	DockWidget->setFeature(ads::CDockWidget::DockWidgetMovable, false);
+	DockWidget->setFeature(ads::CDockWidget::DockWidgetFloatable, false);
 	DockWidget->setTabToolTip(QString("Tab ToolTip\nHodie est dies magna"));
-	DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
+	auto DockArea = DockManager->addDockWidget(ads::CenterDockWidgetArea, DockWidget, TopDockArea);
+
+	// Now we add a custom button to the dock area title bar that will create
+	// new editor widgets when clicked
+	auto CustomButton = new QToolButton(DockArea);
+	CustomButton->setToolTip(QObject::tr("Create Editor"));
+	CustomButton->setIcon(svgIcon(":/adsdemo/images/plus.svg"));
+	CustomButton->setAutoRaise(true);
+	auto TitleBar = DockArea->titleBar();
+	int Index = TitleBar->indexOf(TitleBar->tabBar());
+	TitleBar->insertWidget(Index + 1, CustomButton);
+	QObject::connect(CustomButton, &QToolButton::clicked, [=]()
+	{
+		auto DockWidget = createEditorWidget(ui.menuView);
+		DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
+		DockManager->addDockWidgetTabToArea(DockWidget, DockArea);
+		_this->connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));
+	});
 
 	// Test dock area docking
 	auto RighDockArea = DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), TopDockArea);
diff --git a/demo/demo.qrc b/demo/demo.qrc
index 4995d65..7bc93db 100644
--- a/demo/demo.qrc
+++ b/demo/demo.qrc
@@ -11,5 +11,6 @@
         <file>images/grid_on.svg</file>
         <file>images/custom-menu-button.svg</file>
         <file>app.css</file>
+        <file>images/plus.svg</file>
     </qresource>
 </RCC>
diff --git a/demo/images/plus.svg b/demo/images/plus.svg
new file mode 100644
index 0000000..33e9a27
--- /dev/null
+++ b/demo/images/plus.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="plus.svg">
+  <defs
+     id="defs4">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-4" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-3" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-2.5629517"
+     inkscape:cy="7.4271635"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5228"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+  </sodipodi:namedview>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(628,-140.49998)"
+       id="g5228">
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -620.5,1189.8622 v -11"
+         id="path822-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -615,1184.3622 h -11"
+         id="path822-5-2"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <rdf:Description
+         about="https://iconscout.com/legal#licenses"
+         dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
+         dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
+         dc:publisher="Iconscout"
+         dc:date="2016-12-14"
+         dc:format="image/svg+xml"
+         dc:language="en">
+        <dc:creator>
+          <rdf:Bag>
+            <rdf:li>Jemis Mali</rdf:li>
+          </rdf:Bag>
+        </dc:creator>
+      </rdf:Description>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 3bfdc3c..a7a7baa 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -460,7 +460,7 @@ void CDockAreaTitleBar::updateDockWidgetActionsButtons()
 		return;
 	}
 
-	int InsertIndex = 2;
+	int InsertIndex = indexOf(d->TabsMenuButton);
 	for (auto Action : Actions)
 	{
 		auto Button = new CTitleBarButton(true, this);
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index ff86395..354102d 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -856,6 +856,13 @@ void CDockAreaWidget::closeOtherAreas()
 {
 	dockContainer()->closeOtherAreas(this);
 }
+
+
+//============================================================================
+CDockAreaTitleBar* CDockAreaWidget::titleBar() const
+{
+	return d->TitleBar;
+}
 } // namespace ads
 
 //---------------------------------------------------------------------------
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index 42ca5c8..ebbbe01 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -44,6 +44,7 @@ struct DockAreaWidgetPrivate;
 class CDockManager;
 class CDockContainerWidget;
 class DockContainerWidgetPrivate;
+class CDockAreaTitleBar;
 
 
 /**
@@ -264,6 +265,11 @@ public:
 	 */
 	DockWidgetAreas allowedAreas() const;
 
+	/**
+	 * Returns the title bar of this dock area
+	 */
+	CDockAreaTitleBar* titleBar() const;
+
 public slots:
 	/**
 	 * This activates the tab for the given tab index.