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

system: Enforce symbolic icons in action buttons

Browse Source 
We can simply request the symbolic variant from CSS so that we don't
have to append '-symbolic' to all the names. This will always make
it easier to pick up that information from external sources (like
.desktop files).

https://gitlab.gnome.org/GNOME/gnome-shell/issues/433
This commit is contained in:
Florian Müllner 2018-07-24 16:29:56 +02:00
parent 91da3789bc
commit bd1c7774ee
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/theme/gnome-shell-sass/_common.scss
View File

@ -1124,6 +1124,7 @@ StScrollBar {
} }
.system-menu-action { .system-menu-action {
-st-icon-style: symbolic;
color: $fg_color; color: $fg_color;
border-radius: 32px; /* wish we could do 50% */ border-radius: 32px; /* wish we could do 50% */
padding: 13px; padding: 13px;

8
js/ui/status/system.js
View File

@ -261,7 +261,7 @@ var Indicator = new Lang.Class({
item = new PopupMenu.PopupBaseMenuItem({ reactive: false, item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
can_focus: false }); can_focus: false });
this._settingsAction = this._createActionButton('preferences-system-symbolic', _("Settings")); this._settingsAction = this._createActionButton('preferences-system', _("Settings"));
this._settingsAction.connect('clicked', () => { this._onSettingsClicked(); }); this._settingsAction.connect('clicked', () => { this._onSettingsClicked(); });
item.actor.add(this._settingsAction, { expand: true, x_fill: false }); item.actor.add(this._settingsAction, { expand: true, x_fill: false });
@ -280,7 +280,7 @@ var Indicator = new Lang.Class({
'icon-name', 'icon-name',
bindFlags); bindFlags);
this._lockScreenAction = this._createActionButton('changes-prevent-symbolic', _("Lock")); this._lockScreenAction = this._createActionButton('changes-prevent', _("Lock"));
this._lockScreenAction.connect('clicked', () => { this._lockScreenAction.connect('clicked', () => {
this.menu.itemActivated(BoxPointer.PopupAnimation.NONE); this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
this._systemActions.activateLockScreen(); this._systemActions.activateLockScreen();
@ -291,7 +291,7 @@ var Indicator = new Lang.Class({
'visible', 'visible',
bindFlags); bindFlags);
this._suspendAction = this._createActionButton('media-playback-pause-symbolic', _("Suspend")); this._suspendAction = this._createActionButton('media-playback-pause', _("Suspend"));
this._suspendAction.connect('clicked', () => { this._suspendAction.connect('clicked', () => {
this.menu.itemActivated(BoxPointer.PopupAnimation.NONE); this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
this._systemActions.activateSuspend(); this._systemActions.activateSuspend();
@ -301,7 +301,7 @@ var Indicator = new Lang.Class({
'visible', 'visible',
bindFlags); bindFlags);
this._powerOffAction = this._createActionButton('system-shutdown-symbolic', _("Power Off")); this._powerOffAction = this._createActionButton('system-shutdown', _("Power Off"));
this._powerOffAction.connect('clicked', () => { this._powerOffAction.connect('clicked', () => {
this.menu.itemActivated(BoxPointer.PopupAnimation.NONE); this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
this._systemActions.activatePowerOff(); this._systemActions.activatePowerOff();