enlightenment/clouseau
enlightenment
/
clouseau
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clouseau: Fixed a bug in offline-highlight Was created as a result of previous commit 

Signed-off-by: Aharon Hillel <a.hillel@samsung.com>

SVN revision: 72348
This commit is contained in:
Aharon Hillel 2012-06-18 07:22:56 +00:00 committed by Tom Hacohen
parent d58ccc2ba5
commit 9bb004690c
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/clouseau.c
View File

@ -994,7 +994,11 @@ _gl_selected(void *data EINA_UNUSED, Evas_Object *pobj EINA_UNUSED,
_bmp_object_ptr_cmp, t->ptr);
if (v)
libclouseau_highlight(treeit->ptr, &treeit->info->evas_props);
{ /* Third param gives evas surface when running offline */
bmp_info_st *view = v->data;
libclouseau_highlight(treeit->ptr,
&treeit->info->evas_props, evas_object_evas_get(view->win));
}
/* END - replacing libclouseau_highlight(obj); */
clouseau_obj_information_list_populate(treeit, gui->lb);

11
src/lib/eet_data.c
View File

@ -677,7 +677,7 @@ _verify_e_obj(Evas_Object *obj)
}
void
libclouseau_highlight(Evas_Object *obj, st_evas_props *props)
libclouseau_highlight(Evas_Object *obj, st_evas_props *props, Evas *e)
{
Evas_Object *r;
int x, y, wd, ht;
@ -690,7 +690,7 @@ libclouseau_highlight(Evas_Object *obj, st_evas_props *props)
ht = props->h;
}
else
{
{ /* Check validity of object when working online */
if (_verify_e_obj(obj))
evas_object_geometry_get(obj, &x, &y, &wd, &ht);
else
@ -699,10 +699,11 @@ libclouseau_highlight(Evas_Object *obj, st_evas_props *props)
__func__, obj);
return;
}
}
Evas *e = evas_object_evas_get(obj);
if (!e) return;
/* Take evas from object if working online */
e = evas_object_evas_get(obj);
if (!e) return;
}
/* Continue and do the Highlight */
r = evas_object_rectangle_add(e);

2
src/lib/eet_data.h
View File

@ -194,5 +194,5 @@ Eina_Bool eet_info_save(const char *filename, app_info_st *a, tree_data_st *ftd,
Eina_Bool eet_info_read(const char *filename, app_info_st **app, tree_data_st **ftd);
/* Highlight code, we may choose to move this to other file later */
void libclouseau_highlight(Evas_Object *obj, st_evas_props *props);
void libclouseau_highlight(Evas_Object *obj, st_evas_props *props, Evas *e);
#endif /* EET_DATA_H */

2
src/lib/libclouseau.c
View File

@ -204,7 +204,7 @@ _data(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_Ipc_Event_Server_Data
{ /* Highlight msg contains PTR of object to highlight */
highlight_st *ht = v->data;
Evas_Object *obj = (Evas_Object *) (uintptr_t) ht->object;
libclouseau_highlight(obj, NULL);
libclouseau_highlight(obj, NULL, NULL);
}
break;