Skip to content

Commit 44a0d75

Browse files
committed
theme: fix toolbar expansion button style
1 parent 62f6b7f commit 44a0d75

File tree

17 files changed

+72
-32
lines changed

17 files changed

+72
-32
lines changed

src/data/extra/extra.qrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@
349349
<file>themes/moonlight/checkbox_unchecked.svg</file>
350350
<file>themes/moonlight/checkbox_unchecked_disabled.svg</file>
351351
<file>themes/moonlight/close.svg</file>
352+
<file>themes/moonlight/expand_toolbar.svg</file>
352353
<file>themes/moonlight/close_grey.svg</file>
353354
<file>themes/moonlight/cover.png</file>
354355
<file>themes/moonlight/down.svg</file>
@@ -381,6 +382,7 @@
381382
<file>themes/pure/checkbox_unchecked.svg</file>
382383
<file>themes/pure/checkbox_unchecked_disabled.svg</file>
383384
<file>themes/pure/close.svg</file>
385+
<file>themes/pure/expand_toolbar.svg</file>
384386
<file>themes/pure/close_grey.svg</file>
385387
<file>themes/pure/cover.png</file>
386388
<file>themes/pure/down.svg</file>
@@ -413,6 +415,7 @@
413415
<file>themes/solarized-dark/checkbox_unchecked.svg</file>
414416
<file>themes/solarized-dark/checkbox_unchecked_disabled.svg</file>
415417
<file>themes/solarized-dark/close.svg</file>
418+
<file>themes/solarized-dark/expand_toolbar.svg</file>
416419
<file>themes/solarized-dark/close_grey.svg</file>
417420
<file>themes/solarized-dark/cover.png</file>
418421
<file>themes/solarized-dark/down.svg</file>
@@ -445,6 +448,7 @@
445448
<file>themes/solarized-light/checkbox_unchecked.svg</file>
446449
<file>themes/solarized-light/checkbox_unchecked_disabled.svg</file>
447450
<file>themes/solarized-light/close.svg</file>
451+
<file>themes/solarized-light/expand_toolbar.svg</file>
448452
<file>themes/solarized-light/close_grey.svg</file>
449453
<file>themes/solarized-light/cover.png</file>
450454
<file>themes/solarized-light/down.svg</file>
@@ -804,6 +808,7 @@
804808
<file>themes/vscode-dark/checkbox_unchecked.svg</file>
805809
<file>themes/vscode-dark/checkbox_unchecked_disabled.svg</file>
806810
<file>themes/vscode-dark/close.svg</file>
811+
<file>themes/vscode-dark/expand_toolbar.svg</file>
807812
<file>themes/vscode-dark/close_grey.svg</file>
808813
<file>themes/vscode-dark/cover.png</file>
809814
<file>themes/vscode-dark/down.svg</file>
@@ -837,6 +842,7 @@
837842
<file>themes/vue-light/checkbox_unchecked.svg</file>
838843
<file>themes/vue-light/checkbox_unchecked_disabled.svg</file>
839844
<file>themes/vue-light/close.svg</file>
845+
<file>themes/vue-light/expand_toolbar.svg</file>
840846
<file>themes/vue-light/close_grey.svg</file>
841847
<file>themes/vue-light/cover.png</file>
842848
<file>themes/vue-light/down.svg</file>
@@ -869,6 +875,7 @@
869875
<file>themes/vue-dark/checkbox_unchecked.svg</file>
870876
<file>themes/vue-dark/checkbox_unchecked_disabled.svg</file>
871877
<file>themes/vue-dark/close.svg</file>
878+
<file>themes/vue-dark/expand_toolbar.svg</file>
872879
<file>themes/vue-dark/close_grey.svg</file>
873880
<file>themes/vue-dark/cover.png</file>
874881
<file>themes/vue-dark/down.svg</file>
@@ -905,6 +912,7 @@
905912
<file>themes/vx-idea/checkbox_unchecked.svg</file>
906913
<file>themes/vx-idea/checkbox_unchecked_disabled.svg</file>
907914
<file>themes/vx-idea/close.svg</file>
915+
<file>themes/vx-idea/expand_toolbar.svg</file>
908916
<file>themes/vx-idea/close_grey.svg</file>
909917
<file>themes/vx-idea/cover.png</file>
910918
<file>themes/vx-idea/down.svg</file>
Lines changed: 1 addition & 0 deletions
Loading

src/data/extra/themes/moonlight/interface.qss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,16 @@ QToolBar::separator {
147147
}
148148

149149
QToolBarExtension#qt_toolbar_ext_button {
150-
background-color: @widgets#qtoolbar#extension#bg;
151-
margin: 30px;
150+
qproperty-icon: url(expand_toolbar.svg);
151+
background-color: @widgets#qtoolbutton#bg;
152152
}
153153

154154
QToolBarExtension#qt_toolbar_ext_button:hover {
155-
background-color: @widgets#qtoolbar#extension#hover#bg;
156-
margin: 30px;
155+
background-color: @widgets#qtoolbutton#hover#bg;
156+
}
157+
158+
QToolBarExtension#qt_toolbar_ext_button:pressed {
159+
background-color: @widgets#qtoolbutton#pressed#bg;
157160
}
158161

159162
/* QToolButton */
Lines changed: 1 addition & 0 deletions
Loading

src/data/extra/themes/pure/interface.qss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,16 @@ QToolBar::separator {
166166
}
167167

168168
QToolBarExtension#qt_toolbar_ext_button {
169-
background-color: @widgets#qtoolbar#extension#bg;
170-
margin: 30px;
169+
qproperty-icon: url(expand_toolbar.svg);
170+
background-color: @widgets#qtoolbutton#bg;
171171
}
172172

173173
QToolBarExtension#qt_toolbar_ext_button:hover {
174-
background-color: @widgets#qtoolbar#extension#hover#bg;
175-
margin: 30px;
174+
background-color: @widgets#qtoolbutton#hover#bg;
175+
}
176+
177+
QToolBarExtension#qt_toolbar_ext_button:pressed {
178+
background-color: @widgets#qtoolbutton#pressed#bg;
176179
}
177180

178181
/* QToolButton */
Lines changed: 1 addition & 0 deletions
Loading

src/data/extra/themes/solarized-dark/interface.qss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,16 @@ QToolBar::separator {
143143
}
144144

145145
QToolBarExtension#qt_toolbar_ext_button {
146-
background-color: @widgets#qtoolbar#extension#bg;
147-
margin: 30px;
146+
qproperty-icon: url(expand_toolbar.svg);
147+
background-color: @widgets#qtoolbutton#bg;
148148
}
149149

150150
QToolBarExtension#qt_toolbar_ext_button:hover {
151-
background-color: @widgets#qtoolbar#extension#hover#bg;
152-
margin: 30px;
151+
background-color: @widgets#qtoolbutton#hover#bg;
152+
}
153+
154+
QToolBarExtension#qt_toolbar_ext_button:pressed {
155+
background-color: @widgets#qtoolbutton#pressed#bg;
153156
}
154157

155158
/* QToolButton */
Lines changed: 1 addition & 0 deletions
Loading

src/data/extra/themes/solarized-light/interface.qss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,16 @@ QToolBar::separator {
143143
}
144144

145145
QToolBarExtension#qt_toolbar_ext_button {
146-
background-color: @widgets#qtoolbar#extension#bg;
147-
margin: 30px;
146+
qproperty-icon: url(expand_toolbar.svg);
147+
background-color: @widgets#qtoolbutton#bg;
148148
}
149149

150150
QToolBarExtension#qt_toolbar_ext_button:hover {
151-
background-color: @widgets#qtoolbar#extension#hover#bg;
152-
margin: 30px;
151+
background-color: @widgets#qtoolbutton#hover#bg;
152+
}
153+
154+
QToolBarExtension#qt_toolbar_ext_button:pressed {
155+
background-color: @widgets#qtoolbutton#pressed#bg;
153156
}
154157

155158
/* QToolButton */
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)