Use latest QDetachTabWidget that has 'reattach' button.

2026-08-29 16:40:42 +08:00 · 2024-08-10 11:21:20 -05:00
parent 2b0bc3108c
commit 9a0b461599
2 changed files with 166 additions and 84 deletions
@@ -1,8 +1,10 @@
 #include "QDetachTabWidget.h"
 #include <QtWidgets/QTabBar>
 #include <QtWidgets/QMenu>
+#include <QtWidgets/QHBoxLayout>
 #include <QAction>
 #include <QtGui/QCursor>
+#include <QtGui/QIcon>
 #include <QtCore/QDebug>

 QDetachTabWidget::QDetachTabWidget(QWidget* parent) : QTabWidget(parent) {
@@ -13,6 +15,103 @@ QDetachTabWidget::QDetachTabWidget(QWidget* parent) : QTabWidget(parent) {
    QObject::connect(this,     &QTabWidget::tabCloseRequested,          this, &QDetachTabWidget::handleTabClosedRequested);
 }

+bool QDetachTabWidget::isDetached (int tabIndex) const {
+
+    // Get the tab the user selected.
+    QWidget* w = widget(tabIndex);
+
+    if (w == nullptr) {
+        return false;
+    }
+
+    // If it's the 'placeholder' it is detached.
+    if (w->objectName() == "QDetachTabWidgetPlaceholder") {
+        return true;
+    }
+
+    // Otherwise, it's still attached.
+    return false;
+}
+
+void QDetachTabWidget::detachTab (int tabIndex) {
+
+    // Get the tab the user selected.
+    QWidget* w = widget(tabIndex);
+
+    if (w == nullptr) {
+        return;
+    }
+
+    // It can't be a 'placeholder' as it was already detached.
+    if (w->objectName() == "QDetachTabWidgetPlaceholder") {
+        return;
+    }
+
+    // Create a blank 'placeholder' tab.
+    QDetachTabWidgetPlaceholder* placeholder = new QDetachTabWidgetPlaceholder(tabIndex);
+
+    // Create an entry for the tab cache. Remember the real tab and the 'placeholder' tab. Plus the tab title.
+    QDetachTabInfo tabinfo(tabText(tabIndex), w, placeholder);
+    _tabInfo.append(tabinfo);
+
+    // Remove the real tab.
+    removeTab(tabIndex);
+
+    // Insert the 'placeholder' in the same position.
+    insertTab(tabIndex, placeholder, tabinfo._title);
+
+    // Tweak the detached tab to make sure it can't be destroyed as it is now a normal window.
+    w->setParent(0);
+    Qt::WindowFlags flags     = w->windowFlags();
+    Qt::WindowFlags closeFlag = Qt::WindowCloseButtonHint;
+    flags = flags & (~closeFlag);
+    w->setWindowFlags(flags);
+    w->setWindowTitle(tabinfo._title);
+    w->setWindowIcon(windowIcon());
+    w->show();
+
+    // Connect the placeholder's 'reattach' signal to the slot.
+    QObject::connect(placeholder, &QDetachTabWidgetPlaceholder::reattach,   this, &QDetachTabWidget::handleTabClosedRequested);
+
+    // Notify listeners the tab was detached.
+    emit tabDetached(tabIndex);
+}
+
+void QDetachTabWidget::reattachTab (int tabIndex) {
+
+    // Get the tab the user selected to re-attach.
+    QWidget* w = widget(tabIndex);
+
+    if (w == nullptr) {
+        return;
+    }
+
+    // It must be a 'placeholder'
+    if (w->objectName() != "QDetachTabWidgetPlaceholder") {
+        return;
+    }
+
+    // Look for the 'placeholder' tab in the tab cache.
+    // Note, we do a scan of the cache because a QTabWidget can have isMovable() enabled.
+    // Using 'tabindex' is not always reliable.
+    QList<QDetachTabInfo>::iterator it = findPlaceholderWidget(w);
+    if (it == _tabInfo.end()) {
+        return;
+    }
+
+    // Remove the 'placeholder' tab.
+    removeTab(tabIndex); delete w;
+
+    // Insert the real tab in the same position.
+    insertTab(tabIndex, it->_widget, it->_title);
+
+    // Delete the entry from the tab cache.
+    _tabInfo.erase(it);
+
+    // Notify listeners the tab was reattached.
+    emit tabReattached(tabIndex);
+}
+
 void QDetachTabWidget::closeEvent (QCloseEvent* e) {

    auto it = _tabInfo.begin();
@@ -61,37 +160,8 @@ void QDetachTabWidget::handleShowContextMenu (const QPoint& point) {
    //
    if (action == detachAction) {

-        // Get the tab the user selected.
-        QWidget* w = widget(tabIndex);
-
-        // It can't be a 'placeholder' as it was already detached.
-        if (w->objectName() == "QDetachTabWidgetPlaceholder") {
-            return;
-        }
-
-        // Create a blank 'placeholder' tab.
-        QWidget* placeholder = new QWidget;
-        placeholder->setObjectName("QDetachTabWidgetPlaceholder");
-
-        // Create an entry for the tab cache. Remember the real tab and the 'placeholder' tab. Plus the tab title.
-        QDetachTabInfo tabinfo(tabText(tabIndex), w, placeholder);
-        _tabInfo.append(tabinfo);
-
-        // Remove the real tab.
-        removeTab(tabIndex);
-
-        // Insert the 'placeholder' in the same position.
-        insertTab(tabIndex, placeholder, tabinfo._title);
-
-        // Tweak the detached tab to make sure it can't be destroyed as it is now a normal window.
-        w->setParent(0);
-        Qt::WindowFlags flags     = w->windowFlags();
-        Qt::WindowFlags closeFlag = Qt::WindowCloseButtonHint;
-        flags = flags & (~closeFlag);
-        w->setWindowFlags(flags);
-        w->setWindowTitle(tabinfo._title);
-        w->setWindowIcon(windowIcon());
-        w->show();
+        // Detach the tab.
+        detachTab(tabIndex);

        // Set the tabwidget to the placeholder tab.
        setCurrentIndex(tabIndex);
@@ -102,33 +172,11 @@ void QDetachTabWidget::handleShowContextMenu (const QPoint& point) {
    //
    if (action == reattachAction) {

-        // Get the tab the user selected to re-attach.
-        QWidget* w = widget(tabIndex);
-
-        // It must be a 'placeholder'
-        if (w->objectName() != "QDetachTabWidgetPlaceholder") {
-            return;
-        }
-
-        // Look for the 'placeholder' tab in the tab cache.
-        // Note, we do a scan of the cache because a QTabWidget can have isMovable() enabled.
-        // Using 'tabindex' is not always reliable.
-        QList<QDetachTabInfo>::iterator it = findPlaceholderWidget(w);
-        if (it == _tabInfo.end()) {
-            return;
-        }
-
-        // Remove the 'placeholder' tab.
-        removeTab(tabIndex); delete w;
-
-        // Insert the real tab in the same position.
-        insertTab(tabIndex, it->_widget, it->_title);
+        // Reattach the tab.
+        reattachTab(tabIndex);

        // Set the tabwidget to the real tab.
        setCurrentIndex(tabIndex);
-
-        // Delete the entry from the tab cache.
-        _tabInfo.erase(it);
    }
 }

@@ -140,36 +188,11 @@ void QDetachTabWidget::handleShowContextMenu (const QPoint& point) {
 //
 void QDetachTabWidget::handleTabClosedRequested (int tabIndex) {

-    // Get the widget to be closed.
-    QWidget* w = widget(tabIndex);
+    // Reattach the tab.
+    reattachTab(tabIndex);

-    //qDebug() << "QDetachTabWidget::handleTabClosedRequested:" << tabIndex << w->objectName();
-
-    // If the widget is a 'placeholder', reattach the real widget and delete the 'placeholder'.
-    if (w->objectName() == "QDetachTabWidgetPlaceholder") {
-
-        //qDebug() << "Reattaching detached tab.";
-
-        // Look for the 'placeholder' tab in the tab cache.
-        // Note, we do a scan of the cache because a QTabWidget can have isMovable() enabled.
-        // Using 'tabindex' is not always reliable.
-        QList<QDetachTabInfo>::iterator it = findPlaceholderWidget(w);
-        if (it == _tabInfo.end()) {
-            return;
-        }
-
-        // Remove the 'placeholder' tab.
-        removeTab(tabIndex); delete w;
-
-        // Insert the real tab in the same position.
-        insertTab(tabIndex, it->_widget, it->_title);
-
-        // Set the tabwidget to the real tab.
-        setCurrentIndex(tabIndex);
-
-        // Delete the entry from the tab cache.
-        _tabInfo.erase(it);
-    }
+    // Set the tabwidget to the real tab.
+    setCurrentIndex(tabIndex);
 }

 //
@@ -208,3 +231,33 @@ QList<QDetachTabInfo>::iterator QDetachTabWidget::findPlaceholderWidget (QWidget
    return it;
 }

+//
+// A placeholder widget that has a 'reattach' pushbutton.
+//
+QDetachTabWidgetPlaceholder::QDetachTabWidgetPlaceholder(int tabIndex, QWidget* parent) : QWidget(parent) {
+
+    // This the placeholder's object name. Users of this object can focus
+    // on this name if they need too.
+    setObjectName("QDetachTabWidgetPlaceholder");
+
+    // Create the 'Reattach' button and add a layout to it.
+    _reattachPushButton = new QPushButton("Reattach", this);
+    _reattachPushButton->setIcon(QIcon(":/qt-project.org/styles/commonstyle/images/right-16.png"));
+    _tabIndex           = tabIndex;
+
+    QHBoxLayout* layout = new QHBoxLayout;
+    layout->addStretch();
+    layout->addWidget(_reattachPushButton);
+    layout->addStretch();
+
+    setLayout(layout);
+
+    // We'll handle the 'click' signal.
+    QObject::connect(_reattachPushButton, &QPushButton::clicked,    this, &QDetachTabWidgetPlaceholder::handlePushButtonClicked);
+}
+
+// Handle the pushbutton 'click' by emitting the 'reattach' signal.
+void QDetachTabWidgetPlaceholder::handlePushButtonClicked () {
+    emit reattach(_tabIndex);
+}
+