Skip to content

Commit 593535f

Browse files
soreausoreau
committed
Add wayfire.pc icon directory to the icon search path
1 parent 8a89486 commit 593535f

File tree

3 files changed

+69
-64
lines changed

3 files changed

+69
-64
lines changed

‎icons/plugins/meson.build‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
install_data('plugin-alpha.svg', install_dir: icon_dir)
2-
install_data('plugin-animate.svg', install_dir: icon_dir)
3-
install_data('plugin-annotate.svg', install_dir: icon_dir)
4-
install_data('plugin-autorotate-iio.svg', install_dir: icon_dir)
5-
install_data('plugin-autostart.svg', install_dir: icon_dir)
6-
install_data('plugin-background-view.svg', install_dir: icon_dir)
7-
install_data('plugin-bench.svg', install_dir: icon_dir)
8-
install_data('plugin-blur.svg', install_dir: icon_dir)
9-
install_data('plugin-command.svg', install_dir: icon_dir)
10-
install_data('plugin-core.svg', install_dir: icon_dir)
11-
install_data('plugin-crosshair.svg', install_dir: icon_dir)
12-
install_data('plugin-cube.svg', install_dir: icon_dir)
13-
install_data('plugin-dbus_interface.svg', install_dir: icon_dir)
14-
install_data('plugin-decoration.svg', install_dir: icon_dir)
15-
install_data('plugin-expo.svg', install_dir: icon_dir)
16-
install_data('plugin-extra-gestures.svg', install_dir: icon_dir)
17-
install_data('plugin-extra-protos.svg', install_dir: icon_dir)
18-
install_data('plugin-fast-switcher.svg', install_dir: icon_dir)
19-
install_data('plugin-fisheye.svg', install_dir: icon_dir)
20-
install_data('plugin-follow-focus.svg', install_dir: icon_dir)
21-
install_data('plugin-force-fullscreen.svg', install_dir: icon_dir)
22-
install_data('plugin-grid.svg', install_dir: icon_dir)
23-
install_data('plugin-hinge.svg', install_dir: icon_dir)
24-
install_data('plugin-idle.svg', install_dir: icon_dir)
25-
install_data('plugin-input.svg', install_dir: icon_dir)
26-
install_data('plugin-invert.svg', install_dir: icon_dir)
27-
install_data('plugin-join-views.svg', install_dir: icon_dir)
28-
install_data('plugin-keycolor.svg', install_dir: icon_dir)
29-
install_data('plugin-lxqt-shell.svg', install_dir: icon_dir)
30-
install_data('plugin-mag.svg', install_dir: icon_dir)
31-
install_data('plugin-move.svg', install_dir: icon_dir)
32-
install_data('plugin-obs.svg', install_dir: icon_dir)
33-
install_data('plugin-oswitch.svg', install_dir: icon_dir)
34-
install_data('plugin-place.svg', install_dir: icon_dir)
35-
install_data('plugin-preserve-output.svg', install_dir: icon_dir)
36-
install_data('plugin-resize.svg', install_dir: icon_dir)
37-
install_data('plugin-scale.svg', install_dir: icon_dir)
38-
install_data('plugin-scale-title-filter.svg', install_dir: icon_dir)
39-
install_data('plugin-showrepaint.svg', install_dir: icon_dir)
40-
install_data('plugin-simple-tile.svg', install_dir: icon_dir)
41-
install_data('plugin-switcher.svg', install_dir: icon_dir)
42-
install_data('plugin-view-shot.svg', install_dir: icon_dir)
43-
install_data('plugin-vswipe.svg', install_dir: icon_dir)
44-
install_data('plugin-vswitch.svg', install_dir: icon_dir)
45-
install_data('plugin-water.svg', install_dir: icon_dir)
46-
install_data('plugin-window-rules.svg', install_dir: icon_dir)
47-
install_data('plugin-winzoom.svg', install_dir: icon_dir)
48-
install_data('plugin-wm-actions.svg', install_dir: icon_dir)
49-
install_data('plugin-wobbly.svg', install_dir: icon_dir)
50-
install_data('plugin-workarounds.svg', install_dir: icon_dir)
51-
install_data('plugin-workspace-names.svg', install_dir: icon_dir)
52-
install_data('plugin-wrot.svg', install_dir: icon_dir)
53-
install_data('plugin-zoom.svg', install_dir: icon_dir)
1+
install_data('plugin-alpha.svg', install_dir: wcm_icon_dir)
2+
install_data('plugin-animate.svg', install_dir: wcm_icon_dir)
3+
install_data('plugin-annotate.svg', install_dir: wcm_icon_dir)
4+
install_data('plugin-autorotate-iio.svg', install_dir: wcm_icon_dir)
5+
install_data('plugin-autostart.svg', install_dir: wcm_icon_dir)
6+
install_data('plugin-background-view.svg', install_dir: wcm_icon_dir)
7+
install_data('plugin-bench.svg', install_dir: wcm_icon_dir)
8+
install_data('plugin-blur.svg', install_dir: wcm_icon_dir)
9+
install_data('plugin-command.svg', install_dir: wcm_icon_dir)
10+
install_data('plugin-core.svg', install_dir: wcm_icon_dir)
11+
install_data('plugin-crosshair.svg', install_dir: wcm_icon_dir)
12+
install_data('plugin-cube.svg', install_dir: wcm_icon_dir)
13+
install_data('plugin-dbus_interface.svg', install_dir: wcm_icon_dir)
14+
install_data('plugin-decoration.svg', install_dir: wcm_icon_dir)
15+
install_data('plugin-expo.svg', install_dir: wcm_icon_dir)
16+
install_data('plugin-extra-gestures.svg', install_dir: wcm_icon_dir)
17+
install_data('plugin-extra-protos.svg', install_dir: wcm_icon_dir)
18+
install_data('plugin-fast-switcher.svg', install_dir: wcm_icon_dir)
19+
install_data('plugin-fisheye.svg', install_dir: wcm_icon_dir)
20+
install_data('plugin-follow-focus.svg', install_dir: wcm_icon_dir)
21+
install_data('plugin-force-fullscreen.svg', install_dir: wcm_icon_dir)
22+
install_data('plugin-grid.svg', install_dir: wcm_icon_dir)
23+
install_data('plugin-hinge.svg', install_dir: wcm_icon_dir)
24+
install_data('plugin-idle.svg', install_dir: wcm_icon_dir)
25+
install_data('plugin-input.svg', install_dir: wcm_icon_dir)
26+
install_data('plugin-invert.svg', install_dir: wcm_icon_dir)
27+
install_data('plugin-join-views.svg', install_dir: wcm_icon_dir)
28+
install_data('plugin-keycolor.svg', install_dir: wcm_icon_dir)
29+
install_data('plugin-lxqt-shell.svg', install_dir: wcm_icon_dir)
30+
install_data('plugin-mag.svg', install_dir: wcm_icon_dir)
31+
install_data('plugin-move.svg', install_dir: wcm_icon_dir)
32+
install_data('plugin-obs.svg', install_dir: wcm_icon_dir)
33+
install_data('plugin-oswitch.svg', install_dir: wcm_icon_dir)
34+
install_data('plugin-place.svg', install_dir: wcm_icon_dir)
35+
install_data('plugin-preserve-output.svg', install_dir: wcm_icon_dir)
36+
install_data('plugin-resize.svg', install_dir: wcm_icon_dir)
37+
install_data('plugin-scale.svg', install_dir: wcm_icon_dir)
38+
install_data('plugin-scale-title-filter.svg', install_dir: wcm_icon_dir)
39+
install_data('plugin-showrepaint.svg', install_dir: wcm_icon_dir)
40+
install_data('plugin-simple-tile.svg', install_dir: wcm_icon_dir)
41+
install_data('plugin-switcher.svg', install_dir: wcm_icon_dir)
42+
install_data('plugin-view-shot.svg', install_dir: wcm_icon_dir)
43+
install_data('plugin-vswipe.svg', install_dir: wcm_icon_dir)
44+
install_data('plugin-vswitch.svg', install_dir: wcm_icon_dir)
45+
install_data('plugin-water.svg', install_dir: wcm_icon_dir)
46+
install_data('plugin-window-rules.svg', install_dir: wcm_icon_dir)
47+
install_data('plugin-winzoom.svg', install_dir: wcm_icon_dir)
48+
install_data('plugin-wm-actions.svg', install_dir: wcm_icon_dir)
49+
install_data('plugin-wobbly.svg', install_dir: wcm_icon_dir)
50+
install_data('plugin-workarounds.svg', install_dir: wcm_icon_dir)
51+
install_data('plugin-workspace-names.svg', install_dir: wcm_icon_dir)
52+
install_data('plugin-wrot.svg', install_dir: wcm_icon_dir)
53+
install_data('plugin-zoom.svg', install_dir: wcm_icon_dir)
5454

5555

5656
if wf_shell.found()
57-
install_data('plugin-background.svg', install_dir: icon_dir)
58-
install_data('plugin-dock.svg', install_dir: icon_dir)
59-
install_data('plugin-panel.svg', install_dir: icon_dir)
57+
install_data('plugin-background.svg', install_dir: wcm_icon_dir)
58+
install_data('plugin-dock.svg', install_dir: wcm_icon_dir)
59+
install_data('plugin-panel.svg', install_dir: wcm_icon_dir)
6060
endif

‎meson.build‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ fs = import('fs')
55
add_global_arguments('-DWAYFIRE_CONFIG_FILE="' + get_option('wayfire_config_file_path') + '"', language : 'cpp')
66
add_global_arguments('-DWF_SHELL_CONFIG_FILE="' + get_option('wf_shell_config_file_path') + '"', language : 'cpp')
77

8+
dependency('pkg-config', required : true)
9+
evdev = dependency('libevdev')
810
wayfire = dependency('wayfire', version: '>=0.11.0')
911
wf_shell = dependency('wf-shell', required : get_option('wf_shell'))
1012

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

1416
share_dir = join_paths(get_option('prefix'), 'share')
1517
wayfire_locale_dir = join_paths(share_dir, 'locale')
16-
icon_dir = join_paths(share_dir, 'wcm', 'icons')
18+
wcm_icon_dir = join_paths(share_dir, 'wcm', 'icons')
19+
wayfire_icon_dir = wayfire.get_variable(pkgconfig: 'icondir')
1720

1821
add_global_arguments('-DWAYFIRE_METADATADIR="' + wayfire_metadata_dir + '"', language : 'cpp')
1922
add_global_arguments('-DWAYFIRE_LOCALEDIR="' + wayfire_locale_dir + '"', language : 'cpp')
2023
add_global_arguments('-DWAYFIRE_SYSCONFDIR="' + wayfire_sysconf_dir + '"', language : 'cpp')
2124
if wf_shell.found()
2225
wf_shell_metadata_dir = wf_shell.get_variable(pkgconfig: 'metadatadir')
2326
wf_shell_sysconf_dir = wf_shell.get_variable(pkgconfig: 'sysconfdir')
24-
add_project_arguments('-DHAVE_WFSHELL=1', language : 'cpp')
27+
add_global_arguments('-DHAVE_WFSHELL=1', language : 'cpp')
2528
add_global_arguments('-DWFSHELL_METADATADIR="' + wf_shell_metadata_dir + '"', language : 'cpp')
2629
add_global_arguments('-DWFSHELL_SYSCONFDIR="' + wf_shell_sysconf_dir + '"', language : 'cpp')
2730
endif
28-
add_global_arguments('-DICONDIR="' + icon_dir + '"', language : 'cpp')
29-
30-
dependency('pkg-config', required : true)
31-
evdev = dependency('libevdev')
3231

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

3535
subdir('icons')
3636
subdir('proto')

‎src/wcm.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1870,5 +1870,10 @@ std::string WCM::find_icon(const std::string & name)
18701870
}
18711871
}
18721872

1873-
return ICONDIR "/" + name;
1873+
if (std::filesystem::exists(WAYFIRE_ICONDIR "/" + name))
1874+
{
1875+
return WAYFIRE_ICONDIR "/" + name;
1876+
}
1877+
1878+
return WCM_ICONDIR "/" + name;
18741879
}

0 commit comments

Comments
 (0)