enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e_widget_bgpreview_desk_add now takes an evas instead of an evas object

This commit is contained in:
Mike Blumenkrantz 2013-04-19 11:02:29 +01:00
parent c20ff690f3
commit eeb3b1908a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
2013-04-19 Mike Blumenkrantz
* deskpreview renamed to bgpreview
* e_widget_bgpreview_desk_add now takes an evas instead of an evas object
2013-04-18 Mike Blumenkrantz

1
NEWS
View File

@ -61,6 +61,7 @@ Changes:
* e_util_size_debug_set now also prints for object show/hide events
* E_FN_DEL renamed to E_FREE_FUNC for consistency
* deskpreview renamed to bgpreview
* e_widget_bgpreview_desk_add now takes an evas instead of an evas object
Config:
* move winlist_warp_speed option to pointer_warp_speed
* bindings now use new E_Binding_Event structs for mouse events

8
src/bin/e_widget_bgpreview.c
View File

@ -64,7 +64,7 @@ e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny)
}
EAPI Evas_Object *
e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h)
e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y, int w, int h)
{
E_Widget_Desk_Data *dd;
const char *bgfile;
@ -77,11 +77,11 @@ e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w,
dd->x = x;
dd->y = y;
dd->icon = edje_object_add(evas_object_evas_get(obj));
dd->icon = edje_object_add(e);
e_theme_edje_object_set(dd->icon, "base/theme/widgets",
"e/widgets/bgpreview/desk");
dd->thumb = e_icon_add(evas_object_evas_get(obj));
dd->thumb = e_icon_add(e);
e_icon_fill_inside_set(dd->thumb, EINA_FALSE);
e_icon_file_edje_set(dd->thumb, bgfile, "e/desktop/background");
eina_stringshare_del(bgfile);
@ -207,7 +207,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
{
Evas_Object *dp;
dp = e_widget_bgpreview_desk_add(wd->obj, zone, x, y, mw, mh);
dp = e_widget_bgpreview_desk_add(evas_object_evas_get(wd->obj), zone, x, y, mw, mh);
evas_object_size_hint_aspect_set(dp, EVAS_ASPECT_CONTROL_BOTH, zone->w, zone->h);
evas_object_table_pack(wd->table, dp, x, y, 1, 1);
wd->desks = eina_list_append(wd->desks, dp);

2
src/bin/e_widget_bgpreview.h
View File

@ -3,7 +3,7 @@
EAPI Evas_Object *e_widget_bgpreview_add(Evas *evas, int nx, int ny);
EAPI void e_widget_bgpreview_num_desks_set(Evas_Object *obj, int nx, int ny);
EAPI Evas_Object *e_widget_bgpreview_desk_add(Evas_Object *obj, E_Zone *zone, int x, int y, int w, int h);
EAPI Evas_Object *e_widget_bgpreview_desk_add(Evas *e, E_Zone *zone, int x, int y, int w, int h);
EAPI void e_widget_bgpreview_desk_configurable_set(Evas_Object *obj, Eina_Bool enable);
#endif