awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[tasklist] Fix incorrect icon background. 

The tasklist widget displayed the icon over the statusbar background
ignoring the user preferences of the tasklist widget.

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Alex Cornejo 2008-06-05 00:12:04 -04:00 committed by Julien Danjou
parent adedb9e397
commit e63312766d
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/tasklist.c
View File

@ -27,6 +27,7 @@
#include "ewmh.h" #include "ewmh.h"
#include "tag.h" #include "tag.h"
#include "common/configopts.h" #include "common/configopts.h"
#include "common/markup.h"
extern awesome_t globalconf; extern awesome_t globalconf;
@ -65,14 +66,17 @@ tasklist_isvisible(client_t *c, int screen, showclient_t show)
static int static int
tasklist_draw(draw_context_t *ctx, int screen, tasklist_draw(draw_context_t *ctx, int screen,
widget_node_t *w, widget_node_t *w,
int offset, int used, void *p __attribute__ ((unused))) int offset, int used, void *q __attribute__ ((unused)))
{ {
client_t *c; client_t *c;
Data *d = w->widget->data; Data *d = w->widget->data;
area_t area; area_t area;
char *text; char *text;
int n = 0, i = 0, box_width = 0, icon_width = 0, box_width_rest = 0; int n = 0, i = 0, box_width = 0, icon_width = 0, box_width_rest = 0, j = 0;
NetWMIcon *icon; NetWMIcon *icon;
markup_parser_data_t *p;
const char *elements[] = { "bg", NULL };
xcolor_t bg_color;
if(used >= ctx->width) if(used >= ctx->width)
return (w->area.width = 0); return (w->area.width = 0);
@ -115,6 +119,20 @@ tasklist_draw(draw_context_t *ctx, int screen,
area.height = ctx->height; area.height = ctx->height;
area.width = box_width; area.width = box_width;
/* Actually look for the proper background color, since
* otherwise the background statusbar color is used instead */
p = markup_parser_data_new(elements, NULL, countof(elements));
if(markup_parse(p, text, a_strlen(text)) && p->attribute_names[0])
for(j = 0; p->attribute_names[0][j]; j++)
if(!a_strcmp(p->attribute_names[0][j], "color"))
{
xcolor_new(ctx->connection, ctx->phys_screen, p->attribute_values[0][j], &bg_color);
draw_rectangle(ctx, area, 1.0, true, bg_color);
break;
}
p->text = NULL;
markup_parser_data_delete(&p);
if(c->icon_path) if(c->icon_path)
{ {
area = draw_get_image_size(c->icon_path); area = draw_get_image_size(c->icon_path);