timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl ui win - stop trying to get data of non-image icons 

x11 updates trying to update x properties from image data when icon is
not an image is causing lots of error spam. fix this to check type
first before getting data.
This commit is contained in:
Carsten Haitzler 2016-11-27 22:50:03 +09:00
parent 81242af6f9
commit 892f4abe37
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/lib/elementary/efl_ui_win.c
View File

@ -3127,42 +3127,45 @@ _elm_win_xwin_update(Efl_Ui_Win_Data *sd)
{ {
void *data; void *data;
data = evas_object_image_data_get(sd->icon, EINA_FALSE); if (efl_isa(sd->icon, EFL_CANVAS_IMAGE_CLASS))
if (data)
{ {
Ecore_X_Icon ic; data = evas_object_image_data_get(sd->icon, EINA_FALSE);
int w = 0, h = 0, stride, x, y; if (data)
unsigned char *p;
unsigned int *p2;
evas_object_image_size_get(sd->icon, &w, &h);
stride = evas_object_image_stride_get(sd->icon);
if ((w > 0) && (h > 0) &&
(stride >= (int)(w * sizeof(unsigned int))))
{ {
ic.width = w; Ecore_X_Icon ic;
ic.height = h; int w = 0, h = 0, stride, x, y;
ic.data = malloc(w * h * sizeof(unsigned int)); unsigned char *p;
unsigned int *p2;
if (ic.data) evas_object_image_size_get(sd->icon, &w, &h);
stride = evas_object_image_stride_get(sd->icon);
if ((w > 0) && (h > 0) &&
(stride >= (int)(w * sizeof(unsigned int))))
{ {
p = (unsigned char *)data; ic.width = w;
p2 = (unsigned int *)ic.data; ic.height = h;
for (y = 0; y < h; y++) ic.data = malloc(w * h * sizeof(unsigned int));
if (ic.data)
{ {
for (x = 0; x < w; x++) p = (unsigned char *)data;
p2 = (unsigned int *)ic.data;
for (y = 0; y < h; y++)
{ {
*p2 = *((unsigned int *)p); for (x = 0; x < w; x++)
p += sizeof(unsigned int); {
p2++; *p2 = *((unsigned int *)p);
p += sizeof(unsigned int);
p2++;
}
p += (stride - (w * sizeof(unsigned int)));
} }
p += (stride - (w * sizeof(unsigned int))); ecore_x_netwm_icons_set(sd->x.xwin, &ic, 1);
free(ic.data);
} }
ecore_x_netwm_icons_set(sd->x.xwin, &ic, 1);
free(ic.data);
} }
evas_object_image_data_set(sd->icon, data);
} }
evas_object_image_data_set(sd->icon, data);
} }
} }