diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c')
-rw-r--r-- | libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c b/libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c index 95b6d22..839f0c8 100644 --- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c +++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_util.c | |||
@@ -2,6 +2,7 @@ | |||
2 | # include <config.h> | 2 | # include <config.h> |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | #include <stdlib.h> | ||
5 | #include <string.h> | 6 | #include <string.h> |
6 | 7 | ||
7 | #include <Ecore.h> | 8 | #include <Ecore.h> |
@@ -115,15 +116,16 @@ _ecore_evas_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj _ | |||
115 | } | 116 | } |
116 | 117 | ||
117 | static void | 118 | static void |
118 | _ecore_evas_obj_callback_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) | 119 | _ecore_evas_obj_callback_resize(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__) |
119 | { | 120 | { |
120 | Ecore_Evas *ee = data; | 121 | Ecore_Evas *ee = data; |
121 | Evas_Coord ow, oh, w, h; | 122 | Evas_Coord ow, oh, fw, fh; |
122 | 123 | ||
123 | evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); | 124 | evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); |
124 | ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); | 125 | evas_output_framespace_get(e, NULL, NULL, &fw, &fh); |
125 | /*if ((w != ow) || (h != oh))*/ /* avoid recursion on ecore_evas_resize side */ | 126 | ow += fw; |
126 | ecore_evas_resize(ee, ow, oh); | 127 | oh += fh; |
128 | ecore_evas_resize(ee, ow, oh); | ||
127 | } | 129 | } |
128 | 130 | ||
129 | static void | 131 | static void |