Skip to content

panel: fix icon css matching #491

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
trigg merged 1 commit into from
Jun 21, 2026
+16 −9
Merged

panel: fix icon css matching #491

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
5 changes: 5 additions & 0 deletions metadata/panel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ If full_span is off, both sides of the panel will take the same amount of space,
<default>48</default>
<min>0</min>
</option>
<option name="menu_category_icon_size" type="int">
<_short>Menu category icon size</_short>
<default>48</default>
<min>0</min>
</option>
<option name="menu_item_spacing" type="int">
<_short>Space between menu items</_short>
<default>8</default>
Expand Down
15 changes: 8 additions & 7 deletions src/panel/panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,16 +604,17 @@ void WayfirePanelApp::on_activate()
{"panel/minimal_height", ".widget-icon"},
{"panel/default_icon_size", ".default-icon"},
{"panel/menu_icon_size", ".menu-icon.widget-icon"},
{"panel/menu_item_icon_size", ".app-button.widget-icon"},
{"panel/menu_item_icon_size", ".app-button .default-icon"},
{"panel/menu_category_icon_size", ".app-category .default-icon"},
{"panel/launchers_size", ".launcher.widget-icon"},
{"panel/battery_icon_size", ".battery image.widget-icon"},
{"panel/network_icon_size", ".network.widget-icon"},
{"panel/volume_icon_size", ".volume.widget-icon"},
{"panel/mixer_icon_size", ".mixer.widget-icon"},
{"panel/mixer_popup_icon_size", ".mute-toggle.widget-icon, .default-button.widget-icon"},
{"panel/network_icon_size", ".network .widget-icon"},
{"panel/volume_icon_size", ".volume .widget-icon"},
{"panel/mixer_icon_size", ".mixer .widget-icon"},
{"panel/mixer_popup_icon_size", ".mute-toggle .default-icon, .default-button .default-icon"},
{"panel/notifications_icon_size", ".notification-center .widget-icon"},
{"panel/tray_icon_size", ".tray-button.widget-icon"},
{"panel/brightness_icon_size", ".brightness.widget-icon"},
{"panel/tray_icon_size", ".tray-button .widget-icon"},
{"panel/brightness_icon_size", ".brightness .widget-icon"},
{"panel/window_list_icon_size", ".toplevel-icon.widget-icon"},
};
for (auto pair : icon_sizes_args)
Expand Down
3 changes: 2 additions & 1 deletion src/panel/widgets/command-output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ WfCommandOutputButtons::CommandOutput::CommandOutput(const std::string & name,
if (icon_size > 0)
{
css_provider = Gtk::CssProvider::create();
css_provider->load_from_string(".command-icon-" + name + "{-gtk-icon-size:" + std::to_string(
/* This rule has to be more specific than others to be chosen */
css_provider->load_from_string(".wf-panel .command-icon-" + name + " .widget-icon{-gtk-icon-size:" + std::to_string(
icon_size) + "px;}");
icon.add_css_class("command-icon-" + name);
icon.get_style_context()->add_provider(css_provider, GTK_STYLE_PROVIDER_PRIORITY_USER);
Expand Down
2 changes: 1 addition & 1 deletion src/panel/widgets/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ void WayfireMenu::init(Gtk::Box *container)
category_list["Hidden"] = std::make_unique<WfMenuCategory>("Other Desktops",
"user-desktop");

main_image.add_css_class("widget-icon");
main_image.add_css_class("default-icon");
main_image.add_css_class("menu-icon");

signals.push_back(output->toggle_menu_signal().connect(sigc::mem_fun(*this, &WayfireMenu::toggle_menu)));
Expand Down
Loading