brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switcherPopup: Restore selected pseudo-class

Browse Source 
- move styles to switcher-popup
- reverts a change in a code clean up that causes problems with screen readers

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7336
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3127>
This commit is contained in:
Sam Hewitt 2024-01-19 11:26:34 -03:30 committed by Marge Bot
parent 628f0b5be9
commit 4d1ae863d0
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/theme/gnome-shell-sass/_drawing.scss
View File

@ -344,7 +344,7 @@
&:focus { @include button(focus, $tc:$fg, $c:$bg, $always_dark: $system);} &:focus { @include button(focus, $tc:$fg, $c:$bg, $always_dark: $system);}
&:hover { @include button(hover, $tc:$fg, $c:$bg, $always_dark: $system);} &:hover { @include button(hover, $tc:$fg, $c:$bg, $always_dark: $system);}
&:active { @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);} &:active { @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);}
&:selected, &:highlighted,&:selected,
&:checked { @include button(checked, $tc:$fg, $c:$bg, $always_dark: $system);} &:checked { @include button(checked, $tc:$fg, $c:$bg, $always_dark: $system);}
&:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);} &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);}
} @else { } @else {
@ -352,18 +352,11 @@
&:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} &:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} &:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} &:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:selected, &:highlighted,&:selected,
&:checked { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} &:checked { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
&:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);} &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
} }
&:highlighted {
// brighter background color than other states
$bg: transparentize($fg, 0.8);
@include button(active, $tc:$fg, $c:$bg, $always_dark: $system);
}
&:drop { &:drop {
background-color: transparentize($selected_bg_color, .8); background-color: transparentize($selected_bg_color, .8);
box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, .2); box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, .2);

11
data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
View File

@ -27,6 +27,17 @@ $switcher_radius: $modal_radius + $switcher_padding;
@include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color); @include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color);
// override %tile style so mouse doesn't steal focus // override %tile style so mouse doesn't steal focus
&:hover {background: none;} &:hover {background: none;}
// brighter than normal selected style
&:selected {
background-color: transparentize($osd_fg_color, 0.8);
}
@if $contrast == 'high' {
&:selected {
background-color: transparentize($osd_fg_color, 0.7);
}
}
} }
.separator { .separator {

4
js/ui/switcherPopup.js
View File

@ -494,9 +494,9 @@ export const SwitcherList = GObject.registerClass({
if (this._items[index]) { if (this._items[index]) {
if (justOutline) if (justOutline)
this._items[index].add_style_pseudo_class('selected');
else
this._items[index].add_style_pseudo_class('highlighted'); this._items[index].add_style_pseudo_class('highlighted');
else
this._items[index].add_style_pseudo_class('selected');
} }
this._highlighted = index; this._highlighted = index;