Skip to content

Commit a9246f7

Browse files
author
Uwe Kindler
committed
Switched to ToolButton instead of PushButtons for Close- and TabsMenu button in dock area title bar
1 parent 3f56975 commit a9246f7

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

src/DockAreaTitleBar.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
namespace ads
3434
{
35-
using tTileBarButton = QPushButton;
35+
using tTileBarButton = QToolButton;
3636
/**
3737
* Private data class of CDockAreaTitleBar class (pimpl)
3838
*/
@@ -78,7 +78,8 @@ void DockAreaTitleBarPrivate::createButtons()
7878
{
7979
TabsMenuButton = new tTileBarButton();
8080
TabsMenuButton->setObjectName("tabsMenuButton");
81-
TabsMenuButton->setFlat(true);
81+
TabsMenuButton->setAutoRaise(true);
82+
TabsMenuButton->setPopupMode(QToolButton::InstantPopup);
8283
TabsMenuButton->setIcon(_this->style()->standardIcon(QStyle::SP_TitleBarUnshadeButton));
8384
TabsMenuButton->setMaximumWidth(TabsMenuButton->iconSize().width());
8485

@@ -92,7 +93,7 @@ void DockAreaTitleBarPrivate::createButtons()
9293

9394
CloseButton = new tTileBarButton();
9495
CloseButton->setObjectName("closeButton");
95-
CloseButton->setFlat(true);
96+
CloseButton->setAutoRaise(true);
9697
QIcon CloseIcon(":/ads/close-button.svg");
9798
CloseIcon.addFile(":/ads/close-button-disabled.svg", QSize(), QIcon::Disabled);
9899
CloseButton->setIcon(CloseIcon);

src/DockManager.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ bool DockManagerPrivate::restoreState(const QByteArray &state, int version)
271271
CDockAreaWidget* DockArea = DockContainer->dockArea(i);
272272
QString DockWidgetName = DockArea->property("currentDockWidget").toString();
273273
CDockWidget* DockWidget = _this->findDockWidget(DockWidgetName);
274-
std::cout << "restore DockWIdgetName " << DockWidget->objectName().toStdString() << std::endl;
275274
if (!DockWidget->isClosed())
276275
{
277276
DockArea->internalSetCurrentDockWidget(DockWidget);

src/stylesheets/default.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,14 @@ ads--CDockWidget
5858
border-width: 1px 0 0 0;
5959
}
6060

61-
QPushButton#closeButton,
62-
QPushButton#tabsMenuButton
61+
#closeButton,
62+
#tabsMenuButton
6363
{
64-
padding: 2px;
64+
padding: 0px;
6565
}
6666

67+
68+
6769
QScrollArea#dockWidgetScrollArea
6870
{
6971
padding: 0px;

0 commit comments

Comments
 (0)