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

messageTray: notification should be a style class name, not a global name

Browse Source 
There have been multiple notifications ever since we had a notification stack
per source, so the idea of one notification being on screen at a time has long
been dead.

https://bugzilla.gnome.org/show_bug.cgi?id=661615
This commit is contained in:
Jasper St. Pierre 2011-10-12 18:49:04 -04:00
parent 723a1c843a
commit 399df66b18
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1203,7 +1203,8 @@ StScrollBar StButton#vhandle:hover
height: 36px; height: 36px;
} }
#notification { .notification {
font-size: 11pt;
border-radius: 10px 10px 0px 0px; border-radius: 10px 10px 0px 0px;
background: rgba(0,0,0,0.8); background: rgba(0,0,0,0.8);
padding: 8px 8px 4px 8px; padding: 8px 8px 4px 8px;
@ -1212,7 +1213,7 @@ StScrollBar StButton#vhandle:hover
width: 34em; width: 34em;
} }
#notification.multi-line-notification { .notification.multi-line-notification {
padding-bottom: 8px; padding-bottom: 8px;
} }
@ -1234,7 +1235,7 @@ StScrollBar StButton#vhandle:hover
color: white; color: white;
} }
.summary-boxpointer #notification { .summary-boxpointer .notification {
border-radius: 9px; border-radius: 9px;
background: rgba(0,0,0,0) !important; background: rgba(0,0,0,0) !important;
padding-bottom: 12px; padding-bottom: 12px;
@ -1251,10 +1252,6 @@ StScrollBar StButton#vhandle:hover
padding-bottom: 6px; padding-bottom: 6px;
} }
#summary-notification-stack-scrollview > .top-shadow, #summary-notification-stack-scrollview > .bottom-shadow {
height: 1em;
}
#summary-notification-stack-scrollview:ltr { #summary-notification-stack-scrollview:ltr {
padding-right: 8px; padding-right: 8px;
} }
@ -1263,28 +1260,24 @@ StScrollBar StButton#vhandle:hover
padding-left: 8px; padding-left: 8px;
} }
#notification-scrollview { .notification-scrollview {
max-height: 10em; max-height: 10em;
-st-vfade-offset: 24px; -st-vfade-offset: 24px;
} }
#notification-scrollview > .top-shadow, #notification-scrollview > .bottom-shadow { .notification-scrollview:ltr > StScrollBar {
height: 1em;
}
#notification-scrollview:ltr > StScrollBar {
padding-left: 6px; padding-left: 6px;
} }
#notification-scrollview:rtl > StScrollBar { .notification-scrollview:rtl > StScrollBar {
padding-right: 6px; padding-right: 6px;
} }
#notification-body { .notification-body {
spacing: 5px; spacing: 5px;
} }
#notification-actions { .notification-actions {
spacing: 10px; spacing: 10px;
} }
@ -1411,7 +1404,7 @@ StScrollBar StButton#vhandle:hover
font-style: italic; font-style: italic;
} }
#notification StEntry { .notification StEntry {
padding: 4px; padding: 4px;
border-radius: 4px; border-radius: 4px;
color: #a8a8a8; color: #a8a8a8;
@ -1427,7 +1420,7 @@ StScrollBar StButton#vhandle:hover
caret-size: 1px; caret-size: 1px;
} }
#notification StEntry:focus { .notification StEntry:focus {
border: 1px solid #8b8b8b; border: 1px solid #8b8b8b;
color: #333333; color: #333333;
background-gradient-direction: vertical; background-gradient-direction: vertical;

8
js/ui/messageTray.js
View File

@ -441,7 +441,7 @@ const Notification = new Lang.Class({
this.actor.connect('clicked', Lang.bind(this, this._onClicked)); this.actor.connect('clicked', Lang.bind(this, this._onClicked));
this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
this._table = new St.Table({ name: 'notification', this._table = new St.Table({ style_class: 'notification',
reactive: true }); reactive: true });
this._table.connect('style-changed', Lang.bind(this, this._styleChanged)); this._table.connect('style-changed', Lang.bind(this, this._styleChanged));
this.actor.set_child(this._table); this.actor.set_child(this._table);
@ -592,13 +592,13 @@ const Notification = new Lang.Class({
_createScrollArea: function() { _createScrollArea: function() {
this._table.add_style_class_name('multi-line-notification'); this._table.add_style_class_name('multi-line-notification');
this._scrollArea = new St.ScrollView({ name: 'notification-scrollview', this._scrollArea = new St.ScrollView({ style_class: 'notification-scrollview',
vscrollbar_policy: this._scrollPolicy, vscrollbar_policy: this._scrollPolicy,
hscrollbar_policy: Gtk.PolicyType.NEVER }); hscrollbar_policy: Gtk.PolicyType.NEVER });
this._table.add(this._scrollArea, { row: 1, this._table.add(this._scrollArea, { row: 1,
col: 2 }); col: 2 });
this._updateLastColumnSettings(); this._updateLastColumnSettings();
this._contentArea = new St.BoxLayout({ name: 'notification-body', this._contentArea = new St.BoxLayout({ style_class: 'notification-body',
vertical: true }); vertical: true });
this._scrollArea.add_actor(this._contentArea); this._scrollArea.add_actor(this._contentArea);
// If we know the notification will be expandable, we need to add // If we know the notification will be expandable, we need to add
@ -734,7 +734,7 @@ const Notification = new Lang.Class({
addButton: function(id, label) { addButton: function(id, label) {
if (!this._buttonBox) { if (!this._buttonBox) {
let box = new St.BoxLayout({ name: 'notification-actions' }); let box = new St.BoxLayout({ style_class: 'notification-actions' });
this.setActionArea(box, { x_expand: false, this.setActionArea(box, { x_expand: false,
y_expand: false, y_expand: false,
x_fill: false, x_fill: false,