Skip to content

Make the notifications move out of the way when menus are opened #481

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
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Make the notifications move out of the way when menus are opened #481

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0fb37cd
Make the notifications move out of the way when menus are opened
stan-janssen Mar 29, 2023
70fb61d
Clean up the offset_notification method
stan-janssen Mar 29, 2023
618ac8f
Make offset_notifications asynchronous
stan-janssen Mar 29, 2023
6ed1cbc
Ignore the Panel and Calendar popovers when moving notifications
stan-janssen Mar 29, 2023
386972e
Merge branch 'master' into notifications-avoid-indicator-menus
lenemter Jul 17, 2023
5a4c250
Merge branch 'master' into notifications-avoid-indicator-menus
lenemter Jul 20, 2023
fbda2da
Merge branch 'master' into notifications-avoid-indicator-menus
lenemter Dec 17, 2023
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
33 changes: 33 additions & 0 deletions src/Services/PopoverManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@
* Boston, MA 02110-1301 USA.
*/

[DBus (name = "org.pantheon.gala")]
public interface WMDBus : GLib.Object {
public abstract async void offset_notifications (int32 offset) throws DBusError, Error;
}

public class Wingpanel.Services.PopoverManager : Object {
private unowned Wingpanel.PanelWindow? owner;

private bool grabbed = false; // whether the wingpanel grabbed focus
private bool mousing = false;

private WMDBus? wm = null;

private Gee.HashMap<string, Wingpanel.Widgets.IndicatorEntry> registered_indicators;
private Wingpanel.Widgets.IndicatorPopover popover;
private Wingpanel.Widgets.IndicatorEntry? _current_indicator = null;
Expand Down Expand Up @@ -59,10 +66,12 @@ public class Wingpanel.Services.PopoverManager : Object {
owner.present ();
popover.popup ();
popover.show_all ();
offset_notifications (popover);
_current_indicator.base_indicator.opened ();
} else {
update_has_tooltip (((Wingpanel.Widgets.IndicatorEntry)popover.get_relative_to ()).display_widget);
popover.popdown ();
offset_notifications ();
}
}
}
Expand All @@ -72,6 +81,12 @@ public class Wingpanel.Services.PopoverManager : Object {

this.owner = owner;

try {
this.wm = Bus.get_proxy_sync (BusType.SESSION, "org.pantheon.gala", "/org/pantheon/gala");
} catch (Error e) {
warning ("Could not connect to dbus org.pantheon.gala");
}

popover = new Wingpanel.Widgets.IndicatorPopover ();

popover.leave_notify_event.connect ((e) => {
Expand Down Expand Up @@ -238,4 +253,22 @@ public class Wingpanel.Services.PopoverManager : Object {
}
});
}

private void offset_notifications (Wingpanel.Widgets.IndicatorPopover? popover = null) {
int offset = 0;
if (popover != null
&& current_indicator.base_indicator.code_name != Indicator.APP_LAUNCHER
&& current_indicator.base_indicator.code_name != Indicator.DATETIME) {

popover.get_preferred_height (null, out offset);
}

wm.offset_notifications.begin (offset, (obj, res) => {
try {
wm.offset_notifications.end (res);
} catch (Error e) {
warning ("Could not offset notifications: %s", e.message);
}
});
}
}