discomfitor pushed a commit to branch master.
commit eeb3b1908a48bce47fc3c4390f88c331a746d4c4
Author: Mike Blumenkrantz <[email protected]>
Date: Fri Apr 19 11:02:29 2013 +0100
e_widget_bgpreview_desk_add now takes an evas instead of an evas object
---
ChangeLog | 1 +
NEWS | 1 +
src/bin/e_widget_bgpreview.c | 8 ++++----
src/bin/e_widget_bgpreview.h | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d187fcd..5c8a5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/NEWS b/NEWS
index 18faa7f..548fb0b 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/src/bin/e_widget_bgpreview.c b/src/bin/e_widget_bgpreview.c
index 10a9440..5391ccf 100644
--- a/src/bin/e_widget_bgpreview.c
+++ b/src/bin/e_widget_bgpreview.c
@@ -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);
diff --git a/src/bin/e_widget_bgpreview.h b/src/bin/e_widget_bgpreview.h
index bddeef0..09bb92a 100644
--- a/src/bin/e_widget_bgpreview.h
+++ b/src/bin/e_widget_bgpreview.h
@@ -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
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
