Skip to content

Make pinned action a property action #521

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

Merged
danirabbit merged 1 commit into from
Nov 26, 2025
Merged

Make pinned action a property action #521

Show file tree
Hide file tree
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
33 changes: 8 additions & 25 deletions src/AppSystem/App.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
public class Dock.App : Object {
public const string ACTION_GROUP_PREFIX = "app-actions";
private const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
private const string PINNED_ACTION = "pinned";
private const string SWITCHEROO_ACTION = "switcheroo";
private const string APP_ACTION = "action.%s";

Expand Down Expand Up @@ -46,15 +45,13 @@ public class Dock.App : Object {
}
public bool launching { get; private set; default = false; }

public SimpleActionGroup action_group { get; construct; }
public Menu menu_model { get; construct; }
public SimpleActionGroup app_action_group { get; construct; }
public Menu app_action_menu { get; construct; }

public GLib.GenericArray<Window> windows { get; private owned set; } // Ordered by stacking order with topmost at 0

private static Dock.SwitcherooControl switcheroo_control;

private SimpleAction pinned_action;

public App (GLib.DesktopAppInfo app_info, bool pinned) {
Object (app_info: app_info, pinned: pinned);
}
Expand All @@ -66,11 +63,11 @@ public class Dock.App : Object {
construct {
windows = new GLib.GenericArray<Window> ();

action_group = new SimpleActionGroup ();
app_action_group = new SimpleActionGroup ();

var action_section = new Menu ();
app_action_menu = new Menu ();
foreach (var action in app_info.list_actions ()) {
action_section.append (app_info.get_action_name (action), ACTION_PREFIX + APP_ACTION.printf (action));
app_action_menu.append (app_info.get_action_name (action), ACTION_PREFIX + APP_ACTION.printf (action));
}

if (switcheroo_control != null && switcheroo_control.has_dual_gpu) {
Expand All @@ -83,27 +80,14 @@ public class Dock.App : Object {
launch (context, null, false);
});

action_group.add_action (switcheroo_action);
app_action_group.add_action (switcheroo_action);

action_section.append (
app_action_menu.append (
_("Open with %s Graphics").printf (switcheroo_control.get_gpu_name (!prefers_nondefault_gpu)),
ACTION_PREFIX + SWITCHEROO_ACTION
);
}

var pinned_section = new Menu ();
pinned_section.append (_("Keep in Dock"), ACTION_PREFIX + PINNED_ACTION);

menu_model = new Menu ();
if (action_section.get_n_items () > 0) {
menu_model.append_section (null, action_section);
}
menu_model.append_section (null, pinned_section);

pinned_action = new SimpleAction.stateful (PINNED_ACTION, null, new Variant.boolean (pinned));
pinned_action.change_state.connect ((new_state) => pinned = (bool) new_state);
action_group.add_action (pinned_action);

foreach (var action in app_info.list_actions ()) {
var simple_action = new SimpleAction (APP_ACTION.printf (action), null);
simple_action.activate.connect ((instance, variant) => {
Expand All @@ -114,11 +98,10 @@ public class Dock.App : Object {
var split = instance.name.split (".");
launch (context, split[1]);
});
action_group.add_action (simple_action);
app_action_group.add_action (simple_action);
}

notify["pinned"].connect (() => {
pinned_action.set_state (pinned);
check_remove ();
ItemManager.get_default ().sync_pinned ();
});
Expand Down
21 changes: 18 additions & 3 deletions src/AppSystem/Launcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
*/

public class Dock.Launcher : BaseItem {
private const string ACTION_GROUP_PREFIX = "launcher";
private const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
private const string PINNED_ACTION = "pinned";

private const int DND_TIMEOUT = 1000;

private static Settings? notify_settings;
Expand Down Expand Up @@ -63,7 +67,20 @@ public class Dock.Launcher : BaseItem {
}

construct {
popover_menu = new Gtk.PopoverMenu.from_model (app.menu_model) {
var action_group = new SimpleActionGroup ();
action_group.add_action (new PropertyAction (PINNED_ACTION, app, "pinned"));
insert_action_group (ACTION_GROUP_PREFIX, action_group);

insert_action_group (App.ACTION_GROUP_PREFIX, app.app_action_group);
Copy link
Member

@danirabbit danirabbit Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kinda don't like renaming the action group in App because it looks like this when used elsewhere. I think app.action_group was cleaner


var pinned_section = new Menu ();
pinned_section.append (_("Keep in Dock"), ACTION_PREFIX + PINNED_ACTION);

var menu = new Menu ();
menu.append_section (null, app.app_action_menu);
menu.append_section (null, pinned_section);

popover_menu = new Gtk.PopoverMenu.from_model (menu) {
autohide = true,
position = TOP
};
Expand Down Expand Up @@ -121,8 +138,6 @@ public class Dock.Launcher : BaseItem {

insert_child_after (running_revealer, bin);

insert_action_group (App.ACTION_GROUP_PREFIX, app.action_group);

// We have to destroy the progressbar when it is not needed otherwise it will
// cause continuous layouting of the surface see https://github.com/elementary/dock/issues/279
progress_revealer.notify["child-revealed"].connect (() => {
Expand Down