Skip to content

Commit 3de877f

Browse files
Updated linux stylesheet
Default linux style uses now the provided SVG buttons for the floating widget title bar close button
1 parent e2cebd9 commit 3de877f

File tree

3 files changed

+67
-10
lines changed

3 files changed

+67
-10
lines changed

src/linux/FloatingWidgetTitleBar.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace ads
4545
{
4646

4747
using tTabLabel = CElidingLabel;
48-
using tCloseButton = QPushButton;
48+
using tCloseButton = QToolButton;
4949

5050
/**
5151
* @brief Private data class of public interface CFloatingWidgetTitleBar
@@ -81,7 +81,7 @@ void FloatingWidgetTitleBarPrivate::createLayout()
8181

8282
CloseButton = new tCloseButton();
8383
CloseButton->setObjectName("floatingTitleCloseButton");
84-
CloseButton->setFlat(true);
84+
CloseButton->setAutoRaise(true);
8585

8686
// The standard icons do does not look good on high DPI screens
8787
QIcon CloseIcon;
@@ -190,8 +190,7 @@ void CFloatingWidgetTitleBar::setTitle(const QString &Text)
190190
//============================================================================
191191
void CFloatingWidgetTitleBar::updateStyle()
192192
{
193-
internal::repolishStyle(this);
194-
internal::repolishStyle(d->TitleLabel);
193+
internal::repolishStyle(this, internal::RepolishDirectChildren);
195194
}
196195

197196
} // namespace ads

src/stylesheets/default_linux.css

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ QScrollArea#dockWidgetScrollArea {
7575
background: rgba(0, 0, 0, 32);
7676
}
7777

78+
#tabsMenuButton {
79+
qproperty-icon: url(:/ads/images/tabs-menu-button.svg);
80+
qproperty-iconSize: 16px;
81+
}
82+
7883
#dockAreaCloseButton {
7984
qproperty-icon: url(:/ads/images/close-button.svg),
8085
url(:/ads/images/close-button-disabled.svg) disabled;
@@ -85,4 +90,20 @@ QScrollArea#dockWidgetScrollArea {
8590
qproperty-icon: url(:/ads/images/detach-button.svg),
8691
url(:/ads/images/detach-button-disabled.svg) disabled;
8792
qproperty-iconSize: 16px;
88-
}
93+
}
94+
95+
#floatingTitleCloseButton {
96+
qproperty-icon: url(:/ads/images/close-button.svg);
97+
qproperty-iconSize: 16px;
98+
border: none;
99+
margin: 3px;
100+
}
101+
102+
#floatingTitleCloseButton:hover {
103+
background: rgba(0, 0, 0, 24);
104+
border: none;
105+
}
106+
107+
#floatingTitleCloseButton:pressed {
108+
background: rgba(0, 0, 0, 48);
109+
}

src/stylesheets/focus_highlighting_linux.css

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ QScrollArea#dockWidgetScrollArea {
8888
}
8989

9090

91+
#tabsMenuButton {
92+
qproperty-icon: url(:/ads/images/tabs-menu-button.svg);
93+
qproperty-iconSize: 16px;
94+
}
95+
96+
9197
/* Focus related styling */
9298
ads--CDockWidgetTab[focused="true"] {
9399
background: palette(highlight);
@@ -122,12 +128,43 @@ ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
122128
padding-bottom: 0px;
123129
}
124130

125-
ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar
126-
{
131+
132+
133+
ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar {
127134
background: palette(highlight);
128135
}
129136

130-
ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar>QLabel
131-
{
137+
ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleLabel {
132138
color: palette(light);
133-
}
139+
}
140+
141+
#floatingTitleCloseButton {
142+
qproperty-icon: url(:/ads/images/close-button.svg);
143+
qproperty-iconSize: 16px;
144+
border: none;
145+
margin: 3px;
146+
}
147+
148+
#floatingTitleCloseButton:hover {
149+
background: rgba(0, 0, 0, 24);
150+
border: none;
151+
}
152+
153+
#floatingTitleCloseButton:pressed {
154+
background: rgba(0, 0, 0, 48);
155+
}
156+
157+
158+
ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleCloseButton {
159+
qproperty-icon: url(:/ads/images/close-button-focused.svg);
160+
qproperty-iconSize: 16px;
161+
}
162+
163+
ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleCloseButton:hover {
164+
background: rgba(255, 255, 255, 48);
165+
}
166+
167+
168+
ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleCloseButton:pressed {
169+
background: rgba(255, 255, 255, 92);
170+
}

0 commit comments

Comments
 (0)