mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup icon theme code

Browse source 
Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
This commit is contained in:
Felix Weilbach 2021-05-01 11:38:20 +02:00
parent 93b60f799b
commit 59d245cf5b
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/swaybar/icon.h
View file

@ -27,7 +27,7 @@ struct icon_theme {
char *dir; char *dir;
list_t *subdirs; // struct icon_theme_subdir * list_t *subdirs; // struct icon_theme_subdir *
}; };
list_t *get_basedirs(void);
void init_themes(list_t **themes, list_t **basedirs); void init_themes(list_t **themes, list_t **basedirs);
void finish_themes(list_t *themes, list_t *basedirs); void finish_themes(list_t *themes, list_t *basedirs);

2
swaybar/icon.c
View file

@ -42,7 +42,7 @@ char* append_path_safe(const char * base_path, const char * append_path) {
return path; return path;
} }
list_t *get_basedirs(void) { static list_t *get_basedirs(void) {
list_t *basedirs = create_list(); list_t *basedirs = create_list();
list_add(basedirs, strdup("$HOME/.icons")); // deprecated list_add(basedirs, strdup("$HOME/.icons")); // deprecated

4
swaybar/ipc.c
View file

@ -335,11 +335,11 @@ static bool ipc_parse_config(
wl_list_insert(&config->tray_bindings, &binding->link); wl_list_insert(&config->tray_bindings, &binding->link);
} }
} }
#endif
json_object *icon_theme;
if ((json_object_object_get_ex(bar_config, "icon_theme", &icon_theme))) { if ((json_object_object_get_ex(bar_config, "icon_theme", &icon_theme))) {
config->icon_theme = strdup(json_object_get_string(icon_theme)); config->icon_theme = strdup(json_object_get_string(icon_theme));
} }
#endif
json_object_put(bar_config); json_object_put(bar_config);
return true; return true;

7
swaybar/render.c
View file

@ -758,18 +758,13 @@ uint32_t render_focused_window_icon(cairo_t *cairo,
cairo_surface_t *icon = NULL; cairo_surface_t *icon = NULL;
if (icon_name) { if (icon_name) {
char *icon_theme = output->bar->config->icon_theme; char *icon_theme = output->bar->config->icon_theme;
list_t *basedirs = get_basedirs();
int min_size = 0; int min_size = 0;
int max_size = 0; int max_size = 0;
list_t *themes = create_list();
// TODO: Load correct theme
list_add(themes, "Adwaita");
assert(output->bar); assert(output->bar);
assert(output->bar->themes); assert(output->bar->themes);
char *icon_path = find_icon(output->bar->themes, char *icon_path = find_icon(output->bar->themes,
basedirs, output->bar->basedirs,
icon_name, icon_name,
target_size, target_size,
icon_theme, icon_theme,