Properly implemented flag DockAreaHasCloseButton

Author: githubuser0xFFFF

demo/MainWindow.cpp

@@ -308,8 +308,8 @@ CMainWindow::CMainWindow(QWidget *parent) :
 
 	// Uncomment the following line to have the old style where the dock
 	// area close button closes the active tab
-	//d->DockManager->setConfigFlags({
-	//	CDockManager::DockAreaHasCloseButton | CDockManager::DockAreaCloseButtonClosesTab});
+	//CDockManager::setConfigFlags({CDockManager::DockAreaHasCloseButton
+	//	| CDockManager::DockAreaCloseButtonClosesTab});
 	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
 		d->DockManager, SLOT(openPerspective(const QString&)));
 

src/DockAreaTitleBar.cpp

@@ -181,7 +181,10 @@ void DockAreaTitleBarPrivate::createButtons()
 #endif
 	CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 	CloseButton->setIconSize(QSize(16, 16));
-	TopLayout->addWidget(CloseButton, 0);
+	if (testConfigFlag(CDockManager::DockAreaHasCloseButton))
+	{
+		TopLayout->addWidget(CloseButton, 0);
+	}
 	_this->connect(CloseButton, SIGNAL(clicked()), SLOT(onCloseButtonClicked()));
 }