Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed handling of dock area removal in floating dock container, added close-button.svg icon to enable display of disabled close button

Browse Source
This commit is contained in:
Uwe Kindler
2018-10-31 00:50:18 +01:00
parent 6617cf6f19
commit 1dfabb3bef
6 changed files with 321 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/DockAreaTitleBar.cpp
View File

@@ -93,15 +93,9 @@ void DockAreaTitleBarPrivate::createButtons()
CloseButton = new tTileBarButton();
CloseButton->setObjectName("closeButton");
CloseButton->setFlat(true);
QPixmap ClosePixmap = _this->style()->standardPixmap(QStyle::SP_TitleBarCloseButton);
QIcon CloseIcon;
QStyleOptionButton option;
option.initFrom(CloseButton);
QPixmap ClosePixmapDisabled = _this->style()->generatedIconPixmap(QIcon::Disabled, ClosePixmap, &option);
CloseIcon.addPixmap(ClosePixmap, QIcon::Active);
CloseIcon.addPixmap(ClosePixmapDisabled, QIcon::Disabled);
QIcon CloseIcon(":/ads/close-button.svg");
CloseIcon.addFile(":/ads/close-button-disabled.svg", QSize(), QIcon::Disabled);
CloseButton->setIcon(CloseIcon);
//CloseButton->setIcon(QIcon(":/ads/close.svg"));
CloseButton->setToolTip(QObject::tr("Close"));
CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
TopLayout->addWidget(CloseButton, 0);