Skip to content

Replace indicator order HashMap with a switch #732

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
lenemter merged 3 commits into from
Sep 18, 2026
Merged

Replace indicator order HashMap with a switch #732

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c1bb09
Remove outdated indicator names
lenemter Sep 18, 2026
7523483
Replace indicator order HashMap with a switch
lenemter Sep 18, 2026
3522d3d
Merge branch 'main' into lenemter/simplify-order-2
lenemter Sep 18, 2026
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
31 changes: 10 additions & 21 deletions src/Widgets/IndicatorEntry.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
*/

public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
private const int UNKNOWN_INDICATOR_ORDER = 0;

public Indicator base_indicator { get; construct; }
public Services.PopoverManager popover_manager { get; construct; }

Expand All @@ -42,9 +40,6 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
}
}

/* The order in which the indicators are shown from left to right. */
private static Gee.HashMap<string, int> indicator_order = new Gee.HashMap<string,int> ();

private Gtk.Revealer revealer;

public IndicatorEntry (Indicator base_indicator, Services.PopoverManager popover_manager) {
Expand All @@ -54,18 +49,6 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
);
}

static construct {
// 0 is reserved for UNKNOWN_INDICATOR_ORDER
indicator_order[Indicator.NIGHT_LIGHT] = 1;
indicator_order[Indicator.KEYBOARD] = 2;
indicator_order[Indicator.SOUND] = 3;
indicator_order[Indicator.NETWORK] = 4;
indicator_order[Indicator.BLUETOOTH] = 5;
indicator_order[Indicator.POWER] = 6;
indicator_order[Indicator.MESSAGES] = 7;
indicator_order[Indicator.QUICKSETTINGS] = 8;
}

class construct {
set_css_name ("indicator");
}
Expand Down Expand Up @@ -163,10 +146,16 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin {
}

private static int get_order (Wingpanel.Widgets.IndicatorEntry node) {
if (indicator_order.has_key (node.base_indicator.code_name)) {
return indicator_order[node.base_indicator.code_name];
switch (node.base_indicator.code_name) {
case Indicator.NIGHT_LIGHT: return 1;
case Indicator.KEYBOARD: return 2;
case Indicator.SOUND: return 3;
case Indicator.NETWORK: return 4;
case Indicator.BLUETOOTH: return 5;
case Indicator.POWER: return 6;
case Indicator.MESSAGES: return 7;
case Indicator.QUICKSETTINGS: return 8;
default: return 0;
}

return UNKNOWN_INDICATOR_ORDER;
}
}
Loading