1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDockWidgetGroupWindow: Copy window icons to tabs

Browse Source 
If a QDockWidget has a window icon, copy it to the respective tab of
the group windows.

[ChangeLog][Widgets][QDockWidget] When grouping dock widgets in tabs,
the dock widgets' window icons are now used in the tab bar.

Fixes: QTBUG-136624
Fixes: QTBUG-814
Change-Id: I59c393e864a7bd3e52e376778257aff0dc8aea4b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Axel Spoerl 2025-05-12 11:46:19 +02:00 committed by Volker Hilsheimer
parent 26fc2b4ebf
commit 883afddd1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/widgets/qdockarealayout.cpp
View File

@ -2197,7 +2197,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const
QString title = dw->d_func()->fixedWindowTitle; QString title = dw->d_func()->fixedWindowTitle;
quintptr id = tabId(item); quintptr id = tabId(item);
if (tab_idx == tabBar->count()) { if (tab_idx == tabBar->count()) {
tabBar->insertTab(tab_idx, title); tabBar->insertTab(tab_idx, dw->windowIcon(), title);
#if QT_CONFIG(tooltip) #if QT_CONFIG(tooltip)
tabBar->setTabToolTip(tab_idx, title); tabBar->setTabToolTip(tab_idx, title);
#endif #endif
@ -2207,7 +2207,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const
&& qvariant_cast<quintptr>(tabBar->tabData(tab_idx + 1)) == id) && qvariant_cast<quintptr>(tabBar->tabData(tab_idx + 1)) == id)
tabBar->removeTab(tab_idx); tabBar->removeTab(tab_idx);
else { else {
tabBar->insertTab(tab_idx, title); tabBar->insertTab(tab_idx, dw->windowIcon(), title);
#if QT_CONFIG(tooltip) #if QT_CONFIG(tooltip)
tabBar->setTabToolTip(tab_idx, title); tabBar->setTabToolTip(tab_idx, title);
#endif #endif