Merge branch 'master' into focus_changed_fix

Author: githubuser0xFFFF

demo/MainWindow.cpp

@@ -165,6 +165,7 @@ struct MainWindowPrivate
 	QWidgetAction* PerspectiveListAction = nullptr;
 	QComboBox* PerspectiveComboBox = nullptr;
 	ads::CDockManager* DockManager = nullptr;
+	ads::CDockWidget* WindowTitleTestDockWidget = nullptr;
 
 	MainWindowPrivate(CMainWindow* _public) : _this(_public) {}
 
@@ -382,6 +383,7 @@ void MainWindowPrivate::createContent()
 	}
 
 	DockWidget = createLongTextLabelDockWidget();
+	WindowTitleTestDockWidget = DockWidget;
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetFocusable, false);
 	DockManager->addDockWidget(ads::LeftDockWidgetArea, DockWidget);
 	auto FileSystemWidget = createFileSystemTreeDockWidget();
@@ -496,6 +498,9 @@ void MainWindowPrivate::createActions()
 	ui.menuTests->addSeparator();
 	a = ui.menuTests->addAction("Show Status Dialog");
 	_this->connect(a, SIGNAL(triggered()), SLOT(showStatusDialog()));
+
+	a = ui.menuTests->addAction("Toggle Label 0 Window Title");
+	_this->connect(a, SIGNAL(triggered()), SLOT(toggleDockWidgetWindowTitle()));
 	ui.menuTests->addSeparator();
 }
 
@@ -745,3 +750,20 @@ void CMainWindow::showStatusDialog()
 	Dialog.exec();
 }
 
+
+//============================================================================
+void CMainWindow::toggleDockWidgetWindowTitle()
+{
+	QString Title = d->WindowTitleTestDockWidget->windowTitle();
+	int i = Title.indexOf(" (Test)");
+	if (-1 == i)
+	{
+		Title += " (Test)";
+	}
+	else
+	{
+		Title = Title.left(i);
+	}
+	d->WindowTitleTestDockWidget->setWindowTitle(Title);
+}
+

demo/MainWindow.h

@@ -64,6 +64,7 @@ private slots:
 	void createTable();
 	void onEditorCloseRequested();
 	void showStatusDialog();
+	void toggleDockWidgetWindowTitle();
 };
 
 #endif // MAINWINDOW_H

demo/demo.py

@@ -168,7 +168,11 @@ def _sip_sipfiles_dir(self):
         return os.path.join(sys.prefix, 'sip', 'PyQt5')
 
     def _sip_compile(self, sip_bin, source, sbf):
-        pyi = os.path.join(self.build_lib, "PyQtAds", "QtAds", "ads.pyi")
+        target_dir = os.path.dirname(__file__) if self.inplace else self.build_lib
+        pyi = os.path.join(target_dir, "PyQtAds", "QtAds", "ads.pyi")
+        if not os.path.exists(os.path.dirname(pyi)):
+            os.makedirs(os.path.dirname(pyi))
+        
         cmd = [sip_bin]
         if hasattr(self, 'sip_opts'):
             cmd += self.sip_opts

setup.py

@@ -169,6 +169,7 @@ public:
 		FloatingContainerHasWidgetIcon,
 		HideSingleCentralWidgetTitleBar,
         FocusHighlighting,
+        EqualSplitOnInsertion,
         DefaultDockAreaButtons,
 		DefaultBaseConfig,
         DefaultOpaqueConfig,

sip/DockManager.sip

@@ -31,6 +31,7 @@ public:
 		DockWidgetFloatable,
 		DockWidgetDeleteOnClose,
         CustomCloseHandling,
+        DockWidgetFocusable,
         DefaultDockWidgetFeatures,
         AllDockWidgetFeatures,
 		NoDockWidgetFeatures

sip/DockWidget.sip

@@ -456,6 +456,11 @@ bool CDockAreaTabBar::eventFilter(QObject *watched, QEvent *event)
 		 updateGeometry();
 		 break;
 
+    // Setting the text of a tab will cause a LayoutRequest event
+    case QEvent::LayoutRequest:
+         updateGeometry();
+         break;
+
 	default:
 		break;
 	}