AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 21:40:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'toolbar-combobox' into 'main'

Browse Source 
Don't make all buttons in toolbars flat

Closes #4384

See merge request GNOME/gtk!4103
This commit is contained in:
Matthias Clasen 2021-12-17 00:35:18 +00:00
commit a4760bcff7
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/widget-factory/widget-factory.ui
View File

@ -1927,6 +1927,12 @@ microphone-sensitivity-medium-symbolic</property>
<property name="tooltip-text" translatable="1">Insert something</property>
</object>
</child>
<child>
<object class="GtkColorButton">
<property name="rgba">#9141AC</property>
<property name="tooltip-text" translatable="1">Select a color</property>
</object>
</child>
</object>
</child>
<child>

21
gtk/theme/Default/_common.scss
View File

@ -622,7 +622,7 @@ button {
min-width: 26px;
min-height: 32px;
&.image-button {
&.image-button {
min-width: 30px;
&:only-child {
margin: 4px;
@ -911,7 +911,15 @@ modelbutton.flat arrow {
/* oldstyle toolbar buttons */
.toolbar button {
.toolbar > button,
.toolbar > :not(.linked) > button,
.toolbar :not(.linked) > menubutton > button,
.toolbar :not(.linked) > scalebutton > button,
.toolbar :not(.linked) > dropdown > button,
.toolbar :not(.linked) > colorbutton > button,
.toolbar :not(.linked) > fontbutton > button,
.toolbar :not(.linked) > appchooserbutton > button,
.toolbar :not(.linked) > combobox > box > button {
margin: 1px;
@extend %button_basic_flat;
@ -1319,8 +1327,7 @@ combobox {
background-color: $bg_color;
}
.toolbar,
toolbar {
.toolbar {
@extend %toolbar;
// on OSD
@ -1869,7 +1876,7 @@ popover.background {
> list,
> .view,
> toolbar {
> .toolbar {
border-style: none;
background-color: transparent;
}
@ -2424,7 +2431,7 @@ switch {
border-radius: 50%;
transition: $button_transition;
}
> image { color: transparent; } /* only show i / o for the accessible theme */
&:hover > slider {
@ -2533,7 +2540,7 @@ radio {
}
}
}
@if $variant == 'light' {
// the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background
// color, hence we need special casing.