Changed icon rendering to fix issue 432 git-svn-id: http://tint2.googlecode.com/svn/trunk@734 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
o9000 o9000
3 files changed,
9 insertions(+),
15 deletions(-)
M
src/launcher/launcher.c
→
src/launcher/launcher.c
@@ -348,13 +348,9 @@
Imlib_Image icon_scaled = launcherIcon->icon_scaled; // Render imlib_context_set_image (icon_scaled); - if (server.real_transparency) { - // TODO with compton this does not work with Firefox and Chrome but it works with the other icons ?! - render_image(launcherIcon->area.pix, 0, 0, imlib_image_get_width(), imlib_image_get_height() ); - } else { - imlib_context_set_drawable(launcherIcon->area.pix); - imlib_render_image_on_drawable (0, 0); - } + imlib_context_set_blend(1); + imlib_context_set_drawable(launcherIcon->area.pix); + imlib_render_image_on_drawable(0, 0); } Imlib_Image scale_icon(Imlib_Image original, int icon_size)
M
src/systray/systraybar.c
→
src/systray/systraybar.c
@@ -600,7 +600,9 @@ if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100); imlib_image_put_back_data(data); XCopyArea(server.dsp, render_background, systray.area.pix, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy); - render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height); + imlib_context_set_blend(1); + imlib_context_set_drawable(systray.area.pix); + imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy); XCopyArea(server.dsp, systray.area.pix, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y); imlib_free_image_and_decache(); XFreePixmap(server.dsp, tmp_pmap);
M
src/taskbar/task.c
→
src/taskbar/task.c
@@ -343,13 +343,9 @@ else pos_x = panel->g_task.area.paddingxlr + tsk->area.bg->border.width;
// Render imlib_context_set_image (tsk->icon[tsk->current_state]); - if (server.real_transparency) { - render_image(tsk->area.pix, pos_x, panel->g_task.icon_posy, imlib_image_get_width(), imlib_image_get_height() ); - } - else { - imlib_context_set_drawable(tsk->area.pix); - imlib_render_image_on_drawable (pos_x, panel->g_task.icon_posy); - } + imlib_context_set_blend(1); + imlib_context_set_drawable(tsk->area.pix); + imlib_render_image_on_drawable(pos_x, panel->g_task.icon_posy); }