diff options
author | David Walter Seikel | 2015-06-18 20:57:40 +1000 |
---|---|---|
committer | David Walter Seikel | 2015-06-18 20:57:40 +1000 |
commit | 5a8e243c6658f829495d7999fd6e02fd4c4f65c0 (patch) | |
tree | ad5c803d3d4f175a943f656496ab15a683fbb16b /src/extantz/extantz.c | |
parent | Uncomment this now that EFL got fixed. (diff) | |
download | SledjHamr-5a8e243c6658f829495d7999fd6e02fd4c4f65c0.zip SledjHamr-5a8e243c6658f829495d7999fd6e02fd4c4f65c0.tar.gz SledjHamr-5a8e243c6658f829495d7999fd6e02fd4c4f65c0.tar.bz2 SledjHamr-5a8e243c6658f829495d7999fd6e02fd4c4f65c0.tar.xz |
Fix up yet another API break.
These APIs will settle down soonish, they promise.
Diffstat (limited to 'src/extantz/extantz.c')
-rw-r--r-- | src/extantz/extantz.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index b96346a..6b18eaf 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -267,10 +267,10 @@ static void _on_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA | |||
267 | GLData *gld = &ourGlobals->gld; | 267 | GLData *gld = &ourGlobals->gld; |
268 | Evas_Coord h; | 268 | Evas_Coord h; |
269 | 269 | ||
270 | eo_do(ourGlobals->win, evas_obj_size_get(&ourGlobals->win_w, &ourGlobals->win_h)); | 270 | eo_do(ourGlobals->win, efl_gfx_size_get(&ourGlobals->win_w, &ourGlobals->win_h)); |
271 | eo_do(ourGlobals->tb, | 271 | eo_do(ourGlobals->tb, |
272 | evas_obj_size_hint_min_get(NULL, &h), | 272 | evas_obj_size_hint_min_get(NULL, &h), |
273 | evas_obj_size_set(ourGlobals->win_w, h) | 273 | efl_gfx_size_set(ourGlobals->win_w, h) |
274 | ); | 274 | ); |
275 | // Stop internal windows going under the toolbar. | 275 | // Stop internal windows going under the toolbar. |
276 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); | 276 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); |
@@ -496,7 +496,7 @@ static void makeMainMenu(globals *ourGlobals) | |||
496 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 496 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
497 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 497 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
498 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), | 498 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), |
499 | evas_obj_position_set(0, 0), | 499 | efl_gfx_position_set(0, 0), |
500 | elm_obj_toolbar_align_set(0.0) | 500 | elm_obj_toolbar_align_set(0.0) |
501 | ); | 501 | ); |
502 | ourGlobals->tb = tb; | 502 | ourGlobals->tb = tb; |
@@ -684,14 +684,14 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
684 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 684 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
685 | elm_obj_image_fill_outside_set(EINA_TRUE), | 685 | elm_obj_image_fill_outside_set(EINA_TRUE), |
686 | efl_file_set(buf, NULL), | 686 | efl_file_set(buf, NULL), |
687 | evas_obj_visibility_set(EINA_TRUE) | 687 | efl_gfx_visible_set(EINA_TRUE) |
688 | ); | 688 | ); |
689 | elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg); | 689 | elm_win_resize_object_add(ourGlobals.mainWindow->win, ourGlobals.mainWindow->bg); |
690 | #else | 690 | #else |
691 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); | 691 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); |
692 | eo_do(ourGlobals.mainWindow->bg, | 692 | eo_do(ourGlobals.mainWindow->bg, |
693 | elm_obj_image_file_set(buf, NULL), | 693 | elm_obj_image_file_set(buf, NULL), |
694 | evas_obj_color_set(255, 255, 255, 255) | 694 | efl_gfx_color_set(255, 255, 255, 255) |
695 | ); | 695 | ); |
696 | #endif | 696 | #endif |
697 | 697 | ||