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

messageList: Remove section clear button

Browse Source 
With the new "Clear All" button in the message list as a replacement,
we can remove the individual clear buttons from the sections.

https://bugzilla.gnome.org/show_bug.cgi?id=775763
This commit is contained in:
Florian Müllner 2017-02-26 04:23:54 +01:00
parent d3bb7903e2
commit 8a6157c7c1
4 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/theme/gnome-shell-high-contrast.css
View File

@ -874,20 +874,6 @@ StScrollBar {
.message-list-section-list { .message-list-section-list {
spacing: 0.7em; } spacing: 0.7em; }
.message-list-section-title-box {
spacing: 0.4em; }
.message-list-section-close > StIcon {
icon-size: 16px;
border-radius: 8px;
color: #000;
background-color: #666666; }
/* FIXME: how do you do this in sass? */
.message-list-section-close:hover > StIcon,
.message-list-section-close:focus > StIcon {
background-color: #999999; }
.message { .message {
background-color: #0d0d0d; background-color: #0d0d0d;
border-radius: 3px; } border-radius: 3px; }

2
data/theme/gnome-shell-sass

@ -1 +1 @@
Subproject commit e7d72f3d2dbc4ed6382a619b9c6abc1590a8144e Subproject commit 8001b92b5ef26cb8ea5674c72beed6a4a6439e89

14
data/theme/gnome-shell.css
View File

@ -874,20 +874,6 @@ StScrollBar {
.message-list-section-list { .message-list-section-list {
spacing: 0.7em; } spacing: 0.7em; }
.message-list-section-title-box {
spacing: 0.4em; }
.message-list-section-close > StIcon {
icon-size: 16px;
border-radius: 8px;
color: #393f3f;
background-color: #59594f; }
/* FIXME: how do you do this in sass? */
.message-list-section-close:hover > StIcon,
.message-list-section-close:focus > StIcon {
background-color: #8e8e80; }
.message { .message {
background-color: #454c4c; background-color: #454c4c;
border-radius: 3px; } border-radius: 3px; }

16
js/ui/messageList.js
View File

@ -524,29 +524,16 @@ const MessageListSection = new Lang.Class({
this.actor = new St.BoxLayout({ style_class: 'message-list-section', this.actor = new St.BoxLayout({ style_class: 'message-list-section',
clip_to_allocation: true, clip_to_allocation: true,
x_expand: true, vertical: true }); x_expand: true, vertical: true });
let titleBox = new St.BoxLayout({ style_class: 'message-list-section-title-box' });
this.actor.add_actor(titleBox);
this._title = new St.Button({ style_class: 'message-list-section-title', this._title = new St.Button({ style_class: 'message-list-section-title',
label: title, label: title,
can_focus: true, can_focus: true,
x_expand: true, x_expand: true,
x_align: St.Align.START }); x_align: St.Align.START });
titleBox.add_actor(this._title); this.actor.add_actor(this._title);
this._title.connect('clicked', Lang.bind(this, this._onTitleClicked)); this._title.connect('clicked', Lang.bind(this, this._onTitleClicked));
this._title.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn)); this._title.connect('key-focus-in', Lang.bind(this, this._onKeyFocusIn));
let closeIcon = new St.Icon({ icon_name: 'window-close-symbolic' });
this._closeButton = new St.Button({ style_class: 'message-list-section-close',
child: closeIcon,
accessible_name: _("Clear section"),
can_focus: true });
this._closeButton.set_x_align(Clutter.ActorAlign.END);
titleBox.add_actor(this._closeButton);
this._closeButton.connect('clicked', Lang.bind(this, this.clear));
this._list = new St.BoxLayout({ style_class: 'message-list-section-list', this._list = new St.BoxLayout({ style_class: 'message-list-section-list',
vertical: true }); vertical: true });
this.actor.add_actor(this._list); this.actor.add_actor(this._list);
@ -727,7 +714,6 @@ const MessageListSection = new Lang.Class({
if (changed) if (changed)
this.emit('can-clear-changed'); this.emit('can-clear-changed');
this._closeButton.visible = this.canClear;
this.actor.visible = this.allowed && this._shouldShow(); this.actor.visible = this.allowed && this._shouldShow();
} }
}); });