Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add wayfire.pc icon directory to the icon search path #113

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
soreau merged 1 commit into from
Nov 23, 2025
Merged

Add wayfire.pc icon directory to the icon search path #113

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
112 changes: 56 additions & 56 deletions icons/plugins/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
install_data('plugin-alpha.svg', install_dir: icon_dir)
install_data('plugin-animate.svg', install_dir: icon_dir)
install_data('plugin-annotate.svg', install_dir: icon_dir)
install_data('plugin-autorotate-iio.svg', install_dir: icon_dir)
install_data('plugin-autostart.svg', install_dir: icon_dir)
install_data('plugin-background-view.svg', install_dir: icon_dir)
install_data('plugin-bench.svg', install_dir: icon_dir)
install_data('plugin-blur.svg', install_dir: icon_dir)
install_data('plugin-command.svg', install_dir: icon_dir)
install_data('plugin-core.svg', install_dir: icon_dir)
install_data('plugin-crosshair.svg', install_dir: icon_dir)
install_data('plugin-cube.svg', install_dir: icon_dir)
install_data('plugin-dbus_interface.svg', install_dir: icon_dir)
install_data('plugin-decoration.svg', install_dir: icon_dir)
install_data('plugin-expo.svg', install_dir: icon_dir)
install_data('plugin-extra-gestures.svg', install_dir: icon_dir)
install_data('plugin-extra-protos.svg', install_dir: icon_dir)
install_data('plugin-fast-switcher.svg', install_dir: icon_dir)
install_data('plugin-fisheye.svg', install_dir: icon_dir)
install_data('plugin-follow-focus.svg', install_dir: icon_dir)
install_data('plugin-force-fullscreen.svg', install_dir: icon_dir)
install_data('plugin-grid.svg', install_dir: icon_dir)
install_data('plugin-hinge.svg', install_dir: icon_dir)
install_data('plugin-idle.svg', install_dir: icon_dir)
install_data('plugin-input.svg', install_dir: icon_dir)
install_data('plugin-invert.svg', install_dir: icon_dir)
install_data('plugin-join-views.svg', install_dir: icon_dir)
install_data('plugin-keycolor.svg', install_dir: icon_dir)
install_data('plugin-lxqt-shell.svg', install_dir: icon_dir)
install_data('plugin-mag.svg', install_dir: icon_dir)
install_data('plugin-move.svg', install_dir: icon_dir)
install_data('plugin-obs.svg', install_dir: icon_dir)
install_data('plugin-oswitch.svg', install_dir: icon_dir)
install_data('plugin-place.svg', install_dir: icon_dir)
install_data('plugin-preserve-output.svg', install_dir: icon_dir)
install_data('plugin-resize.svg', install_dir: icon_dir)
install_data('plugin-scale.svg', install_dir: icon_dir)
install_data('plugin-scale-title-filter.svg', install_dir: icon_dir)
install_data('plugin-showrepaint.svg', install_dir: icon_dir)
install_data('plugin-simple-tile.svg', install_dir: icon_dir)
install_data('plugin-switcher.svg', install_dir: icon_dir)
install_data('plugin-view-shot.svg', install_dir: icon_dir)
install_data('plugin-vswipe.svg', install_dir: icon_dir)
install_data('plugin-vswitch.svg', install_dir: icon_dir)
install_data('plugin-water.svg', install_dir: icon_dir)
install_data('plugin-window-rules.svg', install_dir: icon_dir)
install_data('plugin-winzoom.svg', install_dir: icon_dir)
install_data('plugin-wm-actions.svg', install_dir: icon_dir)
install_data('plugin-wobbly.svg', install_dir: icon_dir)
install_data('plugin-workarounds.svg', install_dir: icon_dir)
install_data('plugin-workspace-names.svg', install_dir: icon_dir)
install_data('plugin-wrot.svg', install_dir: icon_dir)
install_data('plugin-zoom.svg', install_dir: icon_dir)
install_data('plugin-alpha.svg', install_dir: wcm_icon_dir)
install_data('plugin-animate.svg', install_dir: wcm_icon_dir)
install_data('plugin-annotate.svg', install_dir: wcm_icon_dir)
install_data('plugin-autorotate-iio.svg', install_dir: wcm_icon_dir)
install_data('plugin-autostart.svg', install_dir: wcm_icon_dir)
install_data('plugin-background-view.svg', install_dir: wcm_icon_dir)
install_data('plugin-bench.svg', install_dir: wcm_icon_dir)
install_data('plugin-blur.svg', install_dir: wcm_icon_dir)
install_data('plugin-command.svg', install_dir: wcm_icon_dir)
install_data('plugin-core.svg', install_dir: wcm_icon_dir)
install_data('plugin-crosshair.svg', install_dir: wcm_icon_dir)
install_data('plugin-cube.svg', install_dir: wcm_icon_dir)
install_data('plugin-dbus_interface.svg', install_dir: wcm_icon_dir)
install_data('plugin-decoration.svg', install_dir: wcm_icon_dir)
install_data('plugin-expo.svg', install_dir: wcm_icon_dir)
install_data('plugin-extra-gestures.svg', install_dir: wcm_icon_dir)
install_data('plugin-extra-protos.svg', install_dir: wcm_icon_dir)
install_data('plugin-fast-switcher.svg', install_dir: wcm_icon_dir)
install_data('plugin-fisheye.svg', install_dir: wcm_icon_dir)
install_data('plugin-follow-focus.svg', install_dir: wcm_icon_dir)
install_data('plugin-force-fullscreen.svg', install_dir: wcm_icon_dir)
install_data('plugin-grid.svg', install_dir: wcm_icon_dir)
install_data('plugin-hinge.svg', install_dir: wcm_icon_dir)
install_data('plugin-idle.svg', install_dir: wcm_icon_dir)
install_data('plugin-input.svg', install_dir: wcm_icon_dir)
install_data('plugin-invert.svg', install_dir: wcm_icon_dir)
install_data('plugin-join-views.svg', install_dir: wcm_icon_dir)
install_data('plugin-keycolor.svg', install_dir: wcm_icon_dir)
install_data('plugin-lxqt-shell.svg', install_dir: wcm_icon_dir)
install_data('plugin-mag.svg', install_dir: wcm_icon_dir)
install_data('plugin-move.svg', install_dir: wcm_icon_dir)
install_data('plugin-obs.svg', install_dir: wcm_icon_dir)
install_data('plugin-oswitch.svg', install_dir: wcm_icon_dir)
install_data('plugin-place.svg', install_dir: wcm_icon_dir)
install_data('plugin-preserve-output.svg', install_dir: wcm_icon_dir)
install_data('plugin-resize.svg', install_dir: wcm_icon_dir)
install_data('plugin-scale.svg', install_dir: wcm_icon_dir)
install_data('plugin-scale-title-filter.svg', install_dir: wcm_icon_dir)
install_data('plugin-showrepaint.svg', install_dir: wcm_icon_dir)
install_data('plugin-simple-tile.svg', install_dir: wcm_icon_dir)
install_data('plugin-switcher.svg', install_dir: wcm_icon_dir)
install_data('plugin-view-shot.svg', install_dir: wcm_icon_dir)
install_data('plugin-vswipe.svg', install_dir: wcm_icon_dir)
install_data('plugin-vswitch.svg', install_dir: wcm_icon_dir)
install_data('plugin-water.svg', install_dir: wcm_icon_dir)
install_data('plugin-window-rules.svg', install_dir: wcm_icon_dir)
install_data('plugin-winzoom.svg', install_dir: wcm_icon_dir)
install_data('plugin-wm-actions.svg', install_dir: wcm_icon_dir)
install_data('plugin-wobbly.svg', install_dir: wcm_icon_dir)
install_data('plugin-workarounds.svg', install_dir: wcm_icon_dir)
install_data('plugin-workspace-names.svg', install_dir: wcm_icon_dir)
install_data('plugin-wrot.svg', install_dir: wcm_icon_dir)
install_data('plugin-zoom.svg', install_dir: wcm_icon_dir)


if wf_shell.found()
install_data('plugin-background.svg', install_dir: icon_dir)
install_data('plugin-dock.svg', install_dir: icon_dir)
install_data('plugin-panel.svg', install_dir: icon_dir)
install_data('plugin-background.svg', install_dir: wcm_icon_dir)
install_data('plugin-dock.svg', install_dir: wcm_icon_dir)
install_data('plugin-panel.svg', install_dir: wcm_icon_dir)
endif
14 changes: 7 additions & 7 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ fs = import('fs')
add_global_arguments('-DWAYFIRE_CONFIG_FILE="' + get_option('wayfire_config_file_path') + '"', language : 'cpp')
add_global_arguments('-DWF_SHELL_CONFIG_FILE="' + get_option('wf_shell_config_file_path') + '"', language : 'cpp')

dependency('pkg-config', required : true)
evdev = dependency('libevdev')
wayfire = dependency('wayfire', version: '>=0.11.0')
wf_shell = dependency('wf-shell', required : get_option('wf_shell'))

Expand All @@ -13,24 +15,22 @@ wayfire_sysconf_dir = wayfire.get_variable(pkgconfig: 'sysconfdir')

share_dir = join_paths(get_option('prefix'), 'share')
wayfire_locale_dir = join_paths(share_dir, 'locale')
icon_dir = join_paths(share_dir, 'wcm', 'icons')
wcm_icon_dir = join_paths(share_dir, 'wcm', 'icons')
wayfire_icon_dir = wayfire.get_variable(pkgconfig: 'icondir')

add_global_arguments('-DWAYFIRE_METADATADIR="' + wayfire_metadata_dir + '"', language : 'cpp')
add_global_arguments('-DWAYFIRE_LOCALEDIR="' + wayfire_locale_dir + '"', language : 'cpp')
add_global_arguments('-DWAYFIRE_SYSCONFDIR="' + wayfire_sysconf_dir + '"', language : 'cpp')
if wf_shell.found()
wf_shell_metadata_dir = wf_shell.get_variable(pkgconfig: 'metadatadir')
wf_shell_sysconf_dir = wf_shell.get_variable(pkgconfig: 'sysconfdir')
add_project_arguments('-DHAVE_WFSHELL=1', language : 'cpp')
add_global_arguments('-DHAVE_WFSHELL=1', language : 'cpp')
add_global_arguments('-DWFSHELL_METADATADIR="' + wf_shell_metadata_dir + '"', language : 'cpp')
add_global_arguments('-DWFSHELL_SYSCONFDIR="' + wf_shell_sysconf_dir + '"', language : 'cpp')
endif
add_global_arguments('-DICONDIR="' + icon_dir + '"', language : 'cpp')

dependency('pkg-config', required : true)
evdev = dependency('libevdev')

add_project_arguments('-DICONDIR="' + icon_dir + '"', language : 'cpp')
add_global_arguments('-DWAYFIRE_ICONDIR="' + wayfire_icon_dir + '"', language : 'cpp')
add_global_arguments('-DWCM_ICONDIR="' + wcm_icon_dir + '"', language : 'cpp')

subdir('icons')
subdir('proto')
Expand Down
7 changes: 6 additions & 1 deletion src/wcm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,5 +1870,10 @@ std::string WCM::find_icon(const std::string & name)
}
}

return ICONDIR "/" + name;
if (std::filesystem::exists(WAYFIRE_ICONDIR "/" + name))
{
return WAYFIRE_ICONDIR "/" + name;
}

return WCM_ICONDIR "/" + name;
}