edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-18 07:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MessageList: Use PERSISTENT display-hint to set whether messages is closable

Browse source 
This drops `Message::canClose()` since users should set the appropriate
display hint instead.
This commit is contained in:
Julian Sparber 2024-04-10 18:09:32 +02:00
parent b2b05a9770
commit 9762f43227
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/ui/calendar.js
View file

@ -801,6 +801,11 @@ class NotificationMessage extends MessageList.Message {
notification.bind_property('gicon',
this, 'icon',
GObject.BindingFlags.SYNC_CREATE);
notification.bind_property_full('display-hint',
this, 'can-close',
GObject.BindingFlags.SYNC_CREATE,
(bind, value) => [true, !(value & MessageTray.DisplayHint.PERSISTENT)],
null);
this._actions = new Map();
this.notification.actions.forEach(action => {
@ -812,10 +817,6 @@ class NotificationMessage extends MessageList.Message {
this.notification.activate();
}
canClose() {
return true;
}
_addAction(action) {
if (!this._buttonBox) {
this._buttonBox = new St.BoxLayout({

17
js/ui/messageList.js
View file

@ -405,6 +405,10 @@ export const Message = GObject.registerClass({
'datetime', 'datetime', 'datetime',
GObject.ParamFlags.READWRITE,
GLib.DateTime),
'can-close': GObject.ParamSpec.boolean(
'can-close', 'can-close', 'can-close',
GObject.ParamFlags.READWRITE,
false),
},
Signals: {
'close': {},
@ -487,7 +491,8 @@ export const Message = GObject.registerClass({
this.connect('destroy', this._onDestroy.bind(this));
this._header.closeButton.connect('clicked', this.close.bind(this));
this._header.closeButton.visible = this.canClose();
this.bind_property('can-close', this._header.closeButton, 'visible', GObject.BindingFlags.SYNC_CREATE);
this._header.expandButton.connect('clicked', () => {
if (this.expanded)
@ -633,10 +638,6 @@ export const Message = GObject.registerClass({
this.emit('unexpanded');
}
canClose() {
return false;
}
_onDestroy() {
}
@ -646,7 +647,7 @@ export const Message = GObject.registerClass({
if (keysym === Clutter.KEY_Delete ||
keysym === Clutter.KEY_KP_Delete ||
keysym === Clutter.KEY_BackSpace) {
if (this.canClose()) {
if (this.canClose) {
this.close();
return Clutter.EVENT_STOP;
}
@ -816,7 +817,7 @@ export const MessageListSection = GObject.registerClass({
}
clear() {
let messages = this._messages.filter(msg => msg.canClose());
let messages = this._messages.filter(msg => msg.canClose);
// If there are few messages, letting them all zoom out looks OK
if (messages.length < 2) {
@ -854,7 +855,7 @@ export const MessageListSection = GObject.registerClass({
this.notify('empty');
}
let canClear = messages.some(m => m.canClose());
let canClear = messages.some(m => m.canClose);
if (this._canClear !== canClear) {
this._canClear = canClear;
this.notify('can-clear');