diff options
Diffstat (limited to '')
-rw-r--r-- | src/libraries/winFang.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c index 1aaa7bd..b07e3f6 100644 --- a/src/libraries/winFang.c +++ b/src/libraries/winFang.c | |||
@@ -212,11 +212,11 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
212 | 212 | ||
213 | snprintf(buf, sizeof(buf), "%s/winFang.edj", prefix_data_get()); | 213 | snprintf(buf, sizeof(buf), "%s/winFang.edj", prefix_data_get()); |
214 | result->layout = eo_add(ELM_LAYOUT_CLASS, obj, | 214 | result->layout = eo_add(ELM_LAYOUT_CLASS, obj, |
215 | evas_obj_size_set(w, h), | 215 | efl_gfx_size_set(w, h), |
216 | evas_obj_position_set(x, y), | 216 | efl_gfx_position_set(x, y), |
217 | evas_obj_name_set(WF_LAYOUT), | 217 | evas_obj_name_set(WF_LAYOUT), |
218 | efl_file_set(buf, WF_LAYOUT), | 218 | efl_file_set(buf, WF_LAYOUT), |
219 | evas_obj_visibility_set(EINA_TRUE) | 219 | efl_gfx_visible_set(EINA_TRUE) |
220 | ); | 220 | ); |
221 | result->e = evas_object_evas_get(result->layout); | 221 | result->e = evas_object_evas_get(result->layout); |
222 | 222 | ||
@@ -233,8 +233,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
233 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 233 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
234 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 234 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
235 | evas_obj_name_set(WF_UNDERLAY), | 235 | evas_obj_name_set(WF_UNDERLAY), |
236 | evas_obj_color_set(0, 0, 0, 0), | 236 | efl_gfx_color_set(0, 0, 0, 0), |
237 | evas_obj_visibility_set(EINA_TRUE) | 237 | efl_gfx_visible_set(EINA_TRUE) |
238 | ); | 238 | ); |
239 | elm_object_part_content_set(result->layout, WF_UNDERLAY, obj); | 239 | elm_object_part_content_set(result->layout, WF_UNDERLAY, obj); |
240 | evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); | 240 | evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, _onBgClick, result); |
@@ -252,9 +252,9 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
252 | result->hand[i] = eo_add(EVAS_IMAGE_CLASS, result->e, | 252 | result->hand[i] = eo_add(EVAS_IMAGE_CLASS, result->e, |
253 | evas_obj_image_filled_set(EINA_TRUE), | 253 | evas_obj_image_filled_set(EINA_TRUE), |
254 | efl_file_set(buf, NULL), | 254 | efl_file_set(buf, NULL), |
255 | evas_obj_size_set(31, 31), | 255 | efl_gfx_size_set(31, 31), |
256 | evas_obj_position_set(cx - 15, cy - 15), | 256 | efl_gfx_position_set(cx - 15, cy - 15), |
257 | evas_obj_visibility_set(EINA_TRUE) | 257 | efl_gfx_visible_set(EINA_TRUE) |
258 | ); | 258 | ); |
259 | evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result); | 259 | evas_object_event_callback_add(result->hand[i], EVAS_CALLBACK_MOUSE_MOVE, _onHandleMove, result); |
260 | // eo_unref(result->hand[i]); | 260 | // eo_unref(result->hand[i]); |
@@ -263,7 +263,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
263 | result->title = eo_add(ELM_LABEL_CLASS, result->layout, | 263 | result->title = eo_add(ELM_LABEL_CLASS, result->layout, |
264 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 264 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
265 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 265 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
266 | evas_obj_visibility_set(EINA_TRUE) | 266 | efl_gfx_visible_set(EINA_TRUE) |
267 | ); | 267 | ); |
268 | elm_object_style_set(result->title, "marker"); | 268 | elm_object_style_set(result->title, "marker"); |
269 | elm_object_text_set(result->title, title); | 269 | elm_object_text_set(result->title, title); |
@@ -277,7 +277,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
277 | evas_obj_name_set(WF_SWALLOW), | 277 | evas_obj_name_set(WF_SWALLOW), |
278 | // TODO - Actually, this should be minus the size of the title stuff. | 278 | // TODO - Actually, this should be minus the size of the title stuff. |
279 | elm_obj_grid_size_set(result->w, result->h), | 279 | elm_obj_grid_size_set(result->w, result->h), |
280 | evas_obj_visibility_set(EINA_TRUE) | 280 | efl_gfx_visible_set(EINA_TRUE) |
281 | ); | 281 | ); |
282 | elm_object_part_content_set(result->layout, WF_SWALLOW, result->grid); | 282 | elm_object_part_content_set(result->layout, WF_SWALLOW, result->grid); |
283 | 283 | ||
@@ -410,7 +410,7 @@ Widget *widgetAdd(winFang *win, char *type , char *title, int x, int y, int w, i | |||
410 | result->obj = eo_add(klass, win->win, | 410 | result->obj = eo_add(klass, win->win, |
411 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 411 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
412 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 412 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
413 | evas_obj_visibility_set(EINA_TRUE), | 413 | efl_gfx_visible_set(EINA_TRUE), |
414 | eo_key_data_set("Widget", result, NULL) | 414 | eo_key_data_set("Widget", result, NULL) |
415 | ); | 415 | ); |
416 | 416 | ||