Skip to content

[email protected]: Do not recreate menu on orientation change. #13247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredcw wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −34
Open

[email protected]: Do not recreate menu on orientation change. #13247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 50 additions & 34 deletions files/usr/share/cinnamon/applets/[email protected]/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const Applet = imports.ui.applet;
const Lang = imports.lang;
const Main = imports.ui.main;
const Gtk = imports.gi.Gtk;
const Gio = imports.gi.Gio;
Expand All @@ -12,6 +11,7 @@ const NotificationDestroyedReason = imports.ui.messageTray.NotificationDestroyed
const Settings = imports.ui.settings;
const Gettext = imports.gettext.domain("cinnamon-applets");
const Util = imports.misc.util;
const SignalManager = imports.misc.signalManager;

const PANEL_EDIT_MODE_KEY = "panel-edit-mode";

Expand All @@ -34,17 +34,23 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
// Layout
this._orientation = orientation;
this.menuManager = new PopupMenu.PopupMenuManager(this);
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);

// Lists
this.notifications = []; // The list of notifications, in order from oldest to newest.

// Events
Main.messageTray.connect('notify-applet-update', Lang.bind(this, this._notification_added));
this.panelEditModeHandler = global.settings.connect('changed::' + PANEL_EDIT_MODE_KEY, Lang.bind(this, this._on_panel_edit_mode_changed));
this.signals = new SignalManager.SignalManager(null);
this.signals.connect(Main.messageTray, 'notify-applet-update', this._notification_added.bind(this));
this.signals.connect(global.settings, 'changed::' + PANEL_EDIT_MODE_KEY, this._on_panel_edit_mode_changed.bind(this));
this.signals.connect(this.menu, 'menu-animated-closed', this._onMenuClosed.bind(this));

// States
this._blinking = false;
this._blink_toggle = false;

this._display();
}

_setKeybinding() {
Expand All @@ -55,12 +61,13 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
on_applet_removed_from_panel () {
Main.keybindingManager.removeXletHotKey(this, "notification-open");
Main.keybindingManager.removeXletHotKey(this, "notification-clear");
global.settings.disconnect(this.panelEditModeHandler);


MessageTray.extensionsHandlingNotifications--;
if (MessageTray.extensionsHandlingNotifications === 0) {
this._clear_all();
}

this.destroy();
}

_openMenu() {
Expand All @@ -76,7 +83,6 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
// Setup the notification container.
this._maincontainer = new St.BoxLayout({name: 'traycontainer', vertical: true});
this._notificationbin = new St.BoxLayout({vertical:true});
this.button_label_box = new St.BoxLayout();

// Setup the tray icon.
this.menu_label = new PopupMenu.PopupMenuItem(stringify(this.notifications.length));
Expand All @@ -87,42 +93,50 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
this.clear_separator = new PopupMenu.PopupSeparatorMenuItem();

this.clear_action = new PopupMenu.PopupMenuItem(_("Clear notifications"));
this.clear_action.connect('activate', Lang.bind(this, this._clear_all));
this.clear_action.connect('activate', this._clear_all.bind(this));
this.clear_action.actor.hide();

if (this._orientation == St.Side.BOTTOM) {
this.menu.addMenuItem(this.menu_label);
this.menu.addActor(this._maincontainer);
this.menu.addMenuItem(this.clear_separator);
this.menu.addMenuItem(this.clear_action);
} else {
this.menu.addMenuItem(this.clear_action);
this.menu.addMenuItem(this.clear_separator);
this.menu.addMenuItem(this.menu_label);
this.menu.addActor(this._maincontainer);
}

this.menu.addMenuItem(this.clear_action);
this.menu.addMenuItem(this.clear_separator);
this.menu.addMenuItem(this.menu_label);
this.menu.addActor(this._maincontainer);

this.scrollview = new St.ScrollView({ x_fill: true, y_fill: true, y_align: St.Align.START, style_class: "vfade"});
this._maincontainer.add(this.scrollview);
this.scrollview.add_actor(this._notificationbin);
this.scrollview.set_policy(St.PolicyType.NEVER, St.PolicyType.AUTOMATIC);
this.scrollview.set_clip_to_allocation(true);

let vscroll = this.scrollview.get_vscroll_bar();
vscroll.connect('scroll-start', Lang.bind(this, function() {
this.menu.passEvents = true;
}));
vscroll.connect('scroll-stop', Lang.bind(this, function() {
this.menu.passEvents = false;
}));
vscroll.connect('scroll-start', () => this.menu.passEvents = true);
vscroll.connect('scroll-stop', () => this.menu.passEvents = false);

// Alternative tray icons.
this._crit_icon = new St.Icon({icon_name: 'critical-notif', icon_type: St.IconType.SYMBOLIC, reactive: true, track_hover: true, style_class: 'system-status-icon' });
this._alt_crit_icon = new St.Icon({icon_name: 'alt-critical-notif', icon_type: St.IconType.SYMBOLIC, reactive: true, track_hover: true, style_class: 'system-status-icon' });

this._on_panel_edit_mode_changed();

this.menu.addSettingsAction(_("Notification Settings"), 'notifications');
this.settingsMenuItem = this.menu.addSettingsAction(_("Notification Settings"), 'notifications');
}

_arrangeDisplay() {
// Remove menu actors so we can put them back in a different order according to orientation.
this.menu.box.remove_all_children();

if (this._orientation == St.Side.BOTTOM) {
this.menu.addActor(this.menu_label.actor);
this.menu.addActor(this._maincontainer);
this.menu.addActor(this.clear_separator.actor);
this.menu.addActor(this.clear_action.actor);
} else {
this.menu.addActor(this.clear_action.actor);
this.menu.addActor(this.clear_separator.actor);
this.menu.addActor(this.menu_label.actor);
this.menu.addActor(this._maincontainer);
}

this.menu.addActor(this.settingsMenuItem.actor);
}

_notification_added (mtray, notification) { // Notification event handler.
Expand Down Expand Up @@ -169,7 +183,7 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {

update_list () {
try {
let count = this.notifications.length;
const count = this.notifications.length;
if (count > 0) { // There are notifications.
this.actor.show();
this.clear_action.actor.show();
Expand Down Expand Up @@ -278,12 +292,7 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
on_orientation_changed (orientation) {
this._orientation = orientation;

if (this.menu) {
this.menu.destroy();
}
this.menu = new Applet.AppletPopupMenu(this, orientation);
this.menuManager.addMenu(this.menu);
this._display();
this._arrangeDisplay();
}

on_applet_clicked(event) {
Expand Down Expand Up @@ -314,7 +323,14 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
this._applet_icon_box.child = this._alt_crit_icon;
}
this._blink_toggle = !this._blink_toggle;
Mainloop.timeout_add_seconds(1, Lang.bind(this, this.critical_blink));
Mainloop.timeout_add_seconds(1, this.critical_blink.bind(this));
}

destroy() {
this.signals.disconnectAllSignals();
this._crit_icon.destroy();
this._alt_crit_icon.destroy();
this.menu.destroy();
}
}

Expand Down
Loading