Switched dock area close button icon to ads specific svg icon

This commit is contained in:
Uwe Kindler 2020-06-14 16:25:18 +02:00
parent e36655a7ab
commit 58744408f0
5 changed files with 44 additions and 11 deletions

View File

@ -163,7 +163,7 @@ void DockAreaTitleBarPrivate::createButtons()
// Undock button
UndockButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasUndockButton));
UndockButton->setObjectName("undockButton");
UndockButton->setObjectName("detachGroupButton");
UndockButton->setAutoRaise(true);
internal::setToolTip(UndockButton, QObject::tr("Detach Group"));
internal::setButtonIcon(UndockButton, QStyle::SP_TitleBarNormalButton, ads::DockAreaUndockIcon);
@ -173,7 +173,7 @@ void DockAreaTitleBarPrivate::createButtons()
// Close button
CloseButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasCloseButton));
CloseButton->setObjectName("closeButton");
CloseButton->setObjectName("dockAreaCloseButton");
CloseButton->setAutoRaise(true);
internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, ads::DockAreaCloseIcon);
if (testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))

View File

@ -19,10 +19,6 @@ ads--CDockAreaWidget
border: 1px solid white;
}
ads--CDockAreaWidget #tabsMenuButton::menu-indicator
{
image: none;
}
ads--CDockWidgetTab
@ -93,3 +89,15 @@ QScrollArea#dockWidgetScrollArea
}
#tabsMenuButton::menu-indicator
{
image: none;
}
#dockAreaCloseButton
{
qproperty-icon: url(:/ads/images/close-button.svg);
qproperty-iconSize: 16px;
}

View File

@ -94,4 +94,10 @@ QScrollArea#dockWidgetScrollArea
background: rgba(0, 0, 0, 32);
}
#dockAreaCloseButton
{
qproperty-icon: url(:/ads/images/close-button.svg);
qproperty-iconSize: 16px;
}

View File

@ -15,11 +15,6 @@ ads--CDockAreaWidget
border: 1px solid white;
}
ads--CDockAreaWidget #tabsMenuButton::menu-indicator
{
image: none;
}
ads--CDockWidgetTab
{
@ -67,6 +62,13 @@ QScrollArea#dockWidgetScrollArea
}
#tabsMenuButton::menu-indicator
{
image: none;
}
#tabCloseButton
{
margin-top: 2px;
@ -89,6 +91,14 @@ QScrollArea#dockWidgetScrollArea
}
#dockAreaCloseButton
{
qproperty-icon: url(:/ads/images/close-button.svg);
qproperty-iconSize: 16px;
}
ads--CDockSplitter::handle
{
background-color: palette(dark);
@ -144,3 +154,5 @@ ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar
padding-bottom: 0px;
}

View File

@ -73,6 +73,13 @@ QScrollArea#dockWidgetScrollArea
}
#dockAreaCloseButton
{
qproperty-icon: url(:/ads/images/close-button.svg);
qproperty-iconSize: 16px;
}
#tabCloseButton
{
margin-top: 2px;