Skip to content

App: cache menu model, wait to init pinned action #680

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

App: cache menu model, wait to init pinned action #680

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6deb74
App: cache menu model, wait to init pinned action
danirabbit Oct 30, 2025
9dbd58b
Merge branch 'master' into danirabbit/app-menu-fixes
danirabbit Oct 30, 2025
8340ecb
Merge branch 'master' into danirabbit/app-menu-fixes
danirabbit Oct 31, 2025
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
58 changes: 34 additions & 24 deletions src/Backend/App.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public class Slingshot.Backend.App : Object {
public Synapse.Match? target { get; private set; default = null; }

private Slingshot.Backend.SwitcherooControl switcheroo_control;
private GLib.SimpleAction pinned_action;
private GLib.Menu? menu_model = null;
private GLib.SimpleAction? pinned_action = null;
private GLib.SimpleAction uninstall_action;
private GLib.SimpleAction view_action;

Expand Down Expand Up @@ -191,6 +192,10 @@ public class Slingshot.Backend.App : Object {
}

public GLib.Menu get_menu_model () {
if (menu_model != null) {
return menu_model;
}

var actions_section = new GLib.Menu ();
var shell_section = new GLib.Menu ();

Expand Down Expand Up @@ -242,24 +247,12 @@ public class Slingshot.Backend.App : Object {
if (Environment.find_program_in_path ("io.elementary.dock") != null) {
has_system_item = true;

var dock = Backend.Dock.get_default ();
var pinned_variant = new Variant.boolean (false);
try {
pinned_variant = new Variant.boolean (desktop_id in dock.dbus.list_launchers ());
} catch (GLib.Error e) {
critical (e.message);
}

pinned_action = new SimpleAction.stateful (PINNED_ACTION, null, pinned_variant);
pinned_action.change_state.connect (pinned_action_change_state);

action_group.add_action (pinned_action);

shell_section.append (
_("Keep in _Dock"),
ACTION_PREFIX + PINNED_ACTION
);

var dock = Backend.Dock.get_default ();
dock.notify["dbus"].connect (() => on_dock_dbus_changed (dock));
on_dock_dbus_changed (dock);
}
Expand Down Expand Up @@ -289,11 +282,11 @@ public class Slingshot.Backend.App : Object {
on_appcenter_dbus_changed.begin (appcenter);
}

var model = new GLib.Menu ();
model.append_section (null, actions_section);
model.append_section (null, shell_section);
menu_model = new GLib.Menu ();
menu_model.append_section (null, actions_section);
menu_model.append_section (null, shell_section);

return model;
return menu_model;
}

private void action_uninstall () {
Expand Down Expand Up @@ -351,16 +344,33 @@ public class Slingshot.Backend.App : Object {
}

private void on_dock_dbus_changed (Backend.Dock dock) {
pinned_action.set_enabled (dock.dbus != null);
if (pinned_action != null) {
pinned_action.set_enabled (dock.dbus != null);
}

if (dock.dbus == null) {
return;
}

try {
pinned_action.change_state (new Variant.boolean (desktop_id in dock.dbus.list_launchers ()));
} catch (GLib.Error e) {
critical (e.message);
if (pinned_action == null) {
try {
pinned_action = new SimpleAction.stateful (
PINNED_ACTION,
null,
new Variant.boolean (desktop_id in dock.dbus.list_launchers ())
);
pinned_action.change_state.connect (pinned_action_change_state);

action_group.add_action (pinned_action);
} catch (Error e) {
critical ("Unable to create pinned launcher action: %s", e.message);
}
} else {
try {
pinned_action.change_state (new Variant.boolean (desktop_id in dock.dbus.list_launchers ()));
} catch (GLib.Error e) {
critical ("Unable to update pinned launcher action state: %s", e.message);
}
}
}

Expand All @@ -375,7 +385,7 @@ public class Slingshot.Backend.App : Object {
dock.dbus.remove_launcher (desktop_id);
}
} catch (GLib.Error e) {
critical (e.message);
critical ("Unable to change pinned launcher: %s", e.message);
}
}
}