QDockWidgetGroupWindow: Copy window icons to tabs
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:
parent
26fc2b4ebf
commit
883afddd1e
@ -2197,7 +2197,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const
|
||||
QString title = dw->d_func()->fixedWindowTitle;
|
||||
quintptr id = tabId(item);
|
||||
if (tab_idx == tabBar->count()) {
|
||||
tabBar->insertTab(tab_idx, title);
|
||||
tabBar->insertTab(tab_idx, dw->windowIcon(), title);
|
||||
#if QT_CONFIG(tooltip)
|
||||
tabBar->setTabToolTip(tab_idx, title);
|
||||
#endif
|
||||
@ -2207,7 +2207,7 @@ bool QDockAreaLayoutInfo::updateTabBar() const
|
||||
&& qvariant_cast<quintptr>(tabBar->tabData(tab_idx + 1)) == id)
|
||||
tabBar->removeTab(tab_idx);
|
||||
else {
|
||||
tabBar->insertTab(tab_idx, title);
|
||||
tabBar->insertTab(tab_idx, dw->windowIcon(), title);
|
||||
#if QT_CONFIG(tooltip)
|
||||
tabBar->setTabToolTip(tab_idx, title);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user