nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Button: svg icon support

Browse source
This commit is contained in:
o9000 2017-03-26 10:39:02 +02:00
parent a2c5553f4f
commit 0fc22b5cd6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/button/button.c
View file

@ -217,13 +217,13 @@ void button_reload_icon(Button *button)
char *new_icon_path = get_icon_path(icon_theme_wrapper, button->backend->icon_name, button->frontend->iconw, TRUE);
if (new_icon_path)
button->frontend->icon = imlib_load_image_immediately(new_icon_path);
button->frontend->icon = load_image(new_icon_path, TRUE);
free(new_icon_path);
// On loading error, fallback to default
if (!button->frontend->icon) {
new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, button->frontend->iconw, TRUE);
if (new_icon_path)
button->frontend->icon = imlib_load_image_immediately(new_icon_path);
button->frontend->icon = load_image(new_icon_path, TRUE);
free(new_icon_path);
}
Imlib_Image original = button->frontend->icon;

4
src/launcher/launcher.c
View file

@ -572,13 +572,13 @@ void launcher_reload_icon_image(Launcher *launcher, LauncherIcon *launcherIcon)
char *new_icon_path = get_icon_path(icon_theme_wrapper, launcherIcon->icon_name, launcherIcon->icon_size, TRUE);
if (new_icon_path)
launcherIcon->image = load_image(new_icon_path, 1);
launcherIcon->image = load_image(new_icon_path, TRUE);
// On loading error, fallback to default
if (!launcherIcon->image) {
free(new_icon_path);
new_icon_path = get_icon_path(icon_theme_wrapper, DEFAULT_ICON, launcherIcon->icon_size, TRUE);
if (new_icon_path)
launcherIcon->image = imlib_load_image_immediately(new_icon_path);
launcherIcon->image = load_image(new_icon_path, TRUE);
}
Imlib_Image original = launcherIcon->image;
launcherIcon->image = scale_icon(launcherIcon->image, launcherIcon->icon_size);

2
src/tint.c
View file

@ -601,7 +601,7 @@ void init_X11_post_config()
for (int i = 0; data_dirs[i] != NULL; i++) {
gchar *path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
if (g_file_test(path, G_FILE_TEST_EXISTS))
default_icon = imlib_load_image(path);
default_icon = load_image(path, TRUE);
g_free(path);
}
if (!default_icon) {