diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2019-02-21 18:19:45 +0100 |
---|---|---|
committer | Xavi Artigas <xavierartigas@yahoo.es> | 2019-02-21 18:43:12 +0100 |
commit | f886941b112573664598808ab0493e83126ea2bb (patch) | |
tree | 80e9b2f2114101f180207bac4c5c218b0425e10a | |
parent | 94efabedf6475a665352ff30f4b869c5a310eb40 (diff) |
api: efl.gfx.size_hints -> efl.gfx.hints
Summary:
these hints are not strictly size-related, so renaming them is more consistent
with their actual function
ref T7563
Depends on D7968
Reviewers: segfaultxavi, cedric, bu5hm4n
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7563
Differential Revision: https://phab.enlightenment.org/D7977
Diffstat (limited to '')
75 files changed, 721 insertions, 721 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index b364beeab4..351ff73fef 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am | |||
@@ -47,7 +47,7 @@ efl_eolian_files = \ | |||
47 | lib/efl/interfaces/efl_gfx_gradient_radial.eo \ | 47 | lib/efl/interfaces/efl_gfx_gradient_radial.eo \ |
48 | lib/efl/interfaces/efl_gfx_filter.eo \ | 48 | lib/efl/interfaces/efl_gfx_filter.eo \ |
49 | lib/efl/interfaces/efl_gfx_blur.eo \ | 49 | lib/efl/interfaces/efl_gfx_blur.eo \ |
50 | lib/efl/interfaces/efl_gfx_size_hint.eo \ | 50 | lib/efl/interfaces/efl_gfx_hint.eo \ |
51 | lib/efl/interfaces/efl_model.eo \ | 51 | lib/efl/interfaces/efl_model.eo \ |
52 | lib/efl/interfaces/efl_animator.eo \ | 52 | lib/efl/interfaces/efl_animator.eo \ |
53 | lib/efl/interfaces/efl_orientation.eo \ | 53 | lib/efl/interfaces/efl_orientation.eo \ |
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index 1802a69f79..338084b31a 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c | |||
@@ -337,7 +337,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
337 | 337 | ||
338 | box = efl_add(EFL_UI_BOX_CLASS, win, | 338 | box = efl_add(EFL_UI_BOX_CLASS, win, |
339 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 339 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
340 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 340 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
341 | efl_content_set(win, efl_added)); | 341 | efl_content_set(win, efl_added)); |
342 | 342 | ||
343 | cs = elm_colorselector_add(win); | 343 | cs = elm_colorselector_add(win); |
@@ -354,16 +354,16 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
354 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); | 354 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); |
355 | efl_add(EFL_UI_IMAGE_CLASS, win, | 355 | efl_add(EFL_UI_IMAGE_CLASS, win, |
356 | efl_file_set(efl_added, buf, NULL), | 356 | efl_file_set(efl_added, buf, NULL), |
357 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), | 357 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), |
358 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), | 358 | efl_gfx_hint_align_set(efl_added, 0.5, 0.5), |
359 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), | 359 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win), |
360 | efl_pack(box, efl_added)); | 360 | efl_pack(box, efl_added)); |
361 | 361 | ||
362 | snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); | 362 | snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); |
363 | efl_add(EFL_UI_IMAGE_CLASS, win, | 363 | efl_add(EFL_UI_IMAGE_CLASS, win, |
364 | efl_file_set(efl_added, buf, NULL), | 364 | efl_file_set(efl_added, buf, NULL), |
365 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), | 365 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), |
366 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), | 366 | efl_gfx_hint_align_set(efl_added, 0.5, 0.5), |
367 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), | 367 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win), |
368 | efl_pack(box, efl_added)); | 368 | efl_pack(box, efl_added)); |
369 | 369 | ||
@@ -409,32 +409,32 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
409 | efl_ui_win_alpha_set(efl_added, EINA_FALSE)); | 409 | efl_ui_win_alpha_set(efl_added, EINA_FALSE)); |
410 | 410 | ||
411 | efl_add(EFL_UI_BG_CLASS, win, | 411 | efl_add(EFL_UI_BG_CLASS, win, |
412 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), | 412 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), |
413 | efl_content_set(win, efl_added)); | 413 | efl_content_set(win, efl_added)); |
414 | 414 | ||
415 | box = efl_add(EFL_UI_BOX_CLASS, win, | 415 | box = efl_add(EFL_UI_BOX_CLASS, win, |
416 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), | 416 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), |
417 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), | 417 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), |
418 | efl_content_set(win, efl_added)); | 418 | efl_content_set(win, efl_added)); |
419 | 419 | ||
420 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); | 420 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); |
421 | 421 | ||
422 | o_bg = efl_add(EFL_UI_BG_CLASS, box, | 422 | o_bg = efl_add(EFL_UI_BG_CLASS, box, |
423 | efl_file_set(efl_added, buf, NULL), | 423 | efl_file_set(efl_added, buf, NULL), |
424 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND), | 424 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND), |
425 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 425 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
426 | efl_pack(box, efl_added)); | 426 | efl_pack(box, efl_added)); |
427 | 427 | ||
428 | hbox = efl_add(EFL_UI_BOX_CLASS, box, | 428 | hbox = efl_add(EFL_UI_BOX_CLASS, box, |
429 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 429 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
430 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 430 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
431 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 431 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
432 | efl_pack(box, efl_added)); | 432 | efl_pack(box, efl_added)); |
433 | 433 | ||
434 | rdg = rd = efl_add(EFL_UI_RADIO_CLASS, hbox, | 434 | rdg = rd = efl_add(EFL_UI_RADIO_CLASS, hbox, |
435 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FILL), | 435 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FILL), |
436 | efl_text_set(efl_added, "Fill"), | 436 | efl_text_set(efl_added, "Fill"), |
437 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 437 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
438 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), | 438 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), |
439 | efl_pack(hbox, efl_added)); | 439 | efl_pack(hbox, efl_added)); |
440 | 440 | ||
@@ -442,7 +442,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
442 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE), | 442 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_INSIDE), |
443 | efl_ui_radio_group_add(efl_added, rdg), | 443 | efl_ui_radio_group_add(efl_added, rdg), |
444 | efl_text_set(efl_added, "Fit Inside"), | 444 | efl_text_set(efl_added, "Fit Inside"), |
445 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 445 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
446 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), | 446 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), |
447 | efl_pack(hbox, efl_added)); | 447 | efl_pack(hbox, efl_added)); |
448 | 448 | ||
@@ -451,7 +451,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
451 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE), | 451 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_FIT_OUTSIDE), |
452 | efl_ui_radio_group_add(efl_added, rdg), | 452 | efl_ui_radio_group_add(efl_added, rdg), |
453 | efl_text_set(efl_added, "Fit Outside"), | 453 | efl_text_set(efl_added, "Fit Outside"), |
454 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 454 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
455 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), | 455 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), |
456 | efl_pack(hbox, efl_added)); | 456 | efl_pack(hbox, efl_added)); |
457 | 457 | ||
@@ -459,7 +459,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
459 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_NONE), | 459 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_NONE), |
460 | efl_ui_radio_group_add(efl_added, rdg), | 460 | efl_ui_radio_group_add(efl_added, rdg), |
461 | efl_text_set(efl_added, "None"), | 461 | efl_text_set(efl_added, "None"), |
462 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 462 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
463 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), | 463 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), |
464 | efl_pack(hbox, efl_added)); | 464 | efl_pack(hbox, efl_added)); |
465 | 465 | ||
@@ -467,7 +467,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
467 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_TILE), | 467 | efl_ui_radio_state_value_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_TILE), |
468 | efl_ui_radio_group_add(efl_added, rdg), | 468 | efl_ui_radio_group_add(efl_added, rdg), |
469 | efl_text_set(efl_added, "Tile"), | 469 | efl_text_set(efl_added, "Tile"), |
470 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 470 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
471 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), | 471 | efl_event_callback_add(efl_added, EFL_UI_RADIO_EVENT_CHANGED, _cb_radio_changed_scale_type, o_bg), |
472 | efl_pack(hbox, efl_added)); | 472 | efl_pack(hbox, efl_added)); |
473 | 473 | ||
@@ -475,7 +475,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
475 | 475 | ||
476 | efl_add(EFL_UI_CHECK_CLASS, hbox, | 476 | efl_add(EFL_UI_CHECK_CLASS, hbox, |
477 | efl_text_set(efl_added, "Bg Color"), | 477 | efl_text_set(efl_added, "Bg Color"), |
478 | efl_gfx_size_hint_weight_set(efl_added, EFL_GFX_SIZE_HINT_EXPAND, 0.0), | 478 | efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.0), |
479 | efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), | 479 | efl_event_callback_add(efl_added, EFL_UI_CHECK_EVENT_CHANGED, _cb_check_changed_scale_type, o_bg), |
480 | efl_pack(hbox, efl_added)); | 480 | efl_pack(hbox, efl_added)); |
481 | 481 | ||
diff --git a/src/bin/elementary/test_box.c b/src/bin/elementary/test_box.c index f50dcb339f..31ccc9cbb0 100644 --- a/src/bin/elementary/test_box.c +++ b/src/bin/elementary/test_box.c | |||
@@ -909,13 +909,13 @@ test_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
909 | /* rectangle with a max size */ | 909 | /* rectangle with a max size */ |
910 | o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, | 910 | o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, |
911 | efl_gfx_color_set(efl_added, 64, 128, 64, 255), | 911 | efl_gfx_color_set(efl_added, 64, 128, 64, 255), |
912 | efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(128, 20))); | 912 | efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(128, 20))); |
913 | efl_pack(bx, o); | 913 | efl_pack(bx, o); |
914 | 914 | ||
915 | /* image with a forced min size */ | 915 | /* image with a forced min size */ |
916 | snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); | 916 | snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); |
917 | o = efl_add(EFL_UI_IMAGE_CLASS, win, | 917 | o = efl_add(EFL_UI_IMAGE_CLASS, win, |
918 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), | 918 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), |
919 | efl_file_set(efl_added, buf, NULL)); | 919 | efl_file_set(efl_added, buf, NULL)); |
920 | efl_pack(bx, o); | 920 | efl_pack(bx, o); |
921 | 921 | ||
diff --git a/src/bin/elementary/test_efl_gfx_map.c b/src/bin/elementary/test_efl_gfx_map.c index 72d7db139d..62165d42fc 100644 --- a/src/bin/elementary/test_efl_gfx_map.c +++ b/src/bin/elementary/test_efl_gfx_map.c | |||
@@ -52,7 +52,7 @@ test_efl_gfx_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
52 | /* image with a min size */ | 52 | /* image with a min size */ |
53 | snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); | 53 | snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); |
54 | img = efl_add(EFL_UI_IMAGE_CLASS, win, | 54 | img = efl_add(EFL_UI_IMAGE_CLASS, win, |
55 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), | 55 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), |
56 | efl_file_set(efl_added, buf, NULL)); | 56 | efl_file_set(efl_added, buf, NULL)); |
57 | efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); | 57 | efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); |
58 | evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, | 58 | evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, |
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index 1ef0873935..9cc2a322f4 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c | |||
@@ -150,7 +150,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
150 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 150 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
151 | 151 | ||
152 | bx = efl_add(EFL_UI_BOX_CLASS, win); | 152 | bx = efl_add(EFL_UI_BOX_CLASS, win); |
153 | efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 153 | efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
154 | efl_content_set(win, bx); | 154 | efl_content_set(win, bx); |
155 | 155 | ||
156 | en = efl_add(EFL_UI_TEXT_CLASS, bx, | 156 | en = efl_add(EFL_UI_TEXT_CLASS, bx, |
@@ -174,24 +174,24 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
174 | "occaecat cupidatat non proident, sunt in culpa qui officia deserunt\n" | 174 | "occaecat cupidatat non proident, sunt in culpa qui officia deserunt\n" |
175 | "mollit anim id est laborum"); | 175 | "mollit anim id est laborum"); |
176 | 176 | ||
177 | efl_gfx_size_hint_min_set(en, EINA_SIZE2D(300, 100)); | 177 | efl_gfx_hint_size_min_set(en, EINA_SIZE2D(300, 100)); |
178 | efl_pack(bx, en); | 178 | efl_pack(bx, en); |
179 | 179 | ||
180 | bx2 = efl_add(EFL_UI_BOX_CLASS, bx); | 180 | bx2 = efl_add(EFL_UI_BOX_CLASS, bx); |
181 | efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 181 | efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
182 | efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); | 182 | efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); |
183 | 183 | ||
184 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); | 184 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); |
185 | efl_text_set(bt, "Sel"); | 185 | efl_text_set(bt, "Sel"); |
186 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); | 186 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en); |
187 | efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 187 | efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); |
188 | efl_pack(bx2, bt); | 188 | efl_pack(bx2, bt); |
189 | elm_object_focus_allow_set(bt, EINA_FALSE); | 189 | elm_object_focus_allow_set(bt, EINA_FALSE); |
190 | 190 | ||
191 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); | 191 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); |
192 | efl_text_set(bt, "Wr"); | 192 | efl_text_set(bt, "Wr"); |
193 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); | 193 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en); |
194 | efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 194 | efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); |
195 | efl_pack(bx2, bt); | 195 | efl_pack(bx2, bt); |
196 | elm_object_focus_allow_set(bt, EINA_FALSE); | 196 | elm_object_focus_allow_set(bt, EINA_FALSE); |
197 | 197 | ||
@@ -209,7 +209,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED | |||
209 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 209 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
210 | 210 | ||
211 | bx = efl_add(EFL_UI_BOX_CLASS, win); | 211 | bx = efl_add(EFL_UI_BOX_CLASS, win); |
212 | efl_gfx_size_hint_weight_set(bx, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 212 | efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
213 | efl_content_set(win, bx); | 213 | efl_content_set(win, bx); |
214 | 214 | ||
215 | en = efl_add(EFL_UI_TEXT_CLASS, bx, | 215 | en = efl_add(EFL_UI_TEXT_CLASS, bx, |
@@ -370,27 +370,27 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
370 | elm_object_focus_set(en, EINA_TRUE); | 370 | elm_object_focus_set(en, EINA_TRUE); |
371 | 371 | ||
372 | bx2 = efl_add(EFL_UI_BOX_CLASS, bx); | 372 | bx2 = efl_add(EFL_UI_BOX_CLASS, bx); |
373 | efl_gfx_size_hint_weight_set(bx2, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 373 | efl_gfx_hint_weight_set(bx2, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
374 | efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); | 374 | efl_ui_direction_set(bx2, EFL_UI_DIR_HORIZONTAL); |
375 | 375 | ||
376 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); | 376 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); |
377 | efl_text_set(bt, "Image"); | 377 | efl_text_set(bt, "Image"); |
378 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); | 378 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en); |
379 | efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 379 | efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); |
380 | efl_pack(bx2, bt); | 380 | efl_pack(bx2, bt); |
381 | elm_object_focus_allow_set(bt, EINA_FALSE); | 381 | elm_object_focus_allow_set(bt, EINA_FALSE); |
382 | 382 | ||
383 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); | 383 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); |
384 | efl_text_set(bt, "Emoticon"); | 384 | efl_text_set(bt, "Emoticon"); |
385 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); | 385 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en); |
386 | efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 386 | efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); |
387 | efl_pack(bx2, bt); | 387 | efl_pack(bx2, bt); |
388 | elm_object_focus_allow_set(bt, EINA_FALSE); | 388 | elm_object_focus_allow_set(bt, EINA_FALSE); |
389 | 389 | ||
390 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); | 390 | bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); |
391 | efl_text_set(bt, "Factory"); | 391 | efl_text_set(bt, "Factory"); |
392 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); | 392 | efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en); |
393 | efl_gfx_size_hint_weight_set(bt, EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 393 | efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0); |
394 | efl_pack(bx2, bt); | 394 | efl_pack(bx2, bt); |
395 | elm_object_focus_allow_set(bt, EINA_FALSE); | 395 | elm_object_focus_allow_set(bt, EINA_FALSE); |
396 | 396 | ||
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c index 7e25aafba7..b598044c7d 100644 --- a/src/bin/elementary/test_evas_map.c +++ b/src/bin/elementary/test_evas_map.c | |||
@@ -60,7 +60,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
60 | /* image with a min size */ | 60 | /* image with a min size */ |
61 | snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); | 61 | snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get()); |
62 | img = efl_add(EFL_UI_IMAGE_CLASS, win, | 62 | img = efl_add(EFL_UI_IMAGE_CLASS, win, |
63 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(64, 64)), | 63 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), |
64 | efl_file_set(efl_added, buf, NULL)); | 64 | efl_file_set(efl_added, buf, NULL)); |
65 | efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); | 65 | efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL); |
66 | evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, | 66 | evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE, |
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c index 7ce8933806..6c3162feb4 100644 --- a/src/bin/elementary/test_evas_mask.c +++ b/src/bin/elementary/test_evas_mask.c | |||
@@ -129,8 +129,8 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
129 | // FIXME: No genlist in EO API | 129 | // FIXME: No genlist in EO API |
130 | o = gl = elm_genlist_add(win); | 130 | o = gl = elm_genlist_add(win); |
131 | elm_genlist_homogeneous_set(gl, 1); | 131 | elm_genlist_homogeneous_set(gl, 1); |
132 | efl_gfx_size_hint_align_set(o, -1, -1); | 132 | efl_gfx_hint_align_set(o, -1, -1); |
133 | efl_gfx_size_hint_weight_set(o, 1, 1); | 133 | efl_gfx_hint_weight_set(o, 1, 1); |
134 | 134 | ||
135 | itc = elm_genlist_item_class_new(); | 135 | itc = elm_genlist_item_class_new(); |
136 | itc->item_style = "default"; | 136 | itc->item_style = "default"; |
@@ -154,26 +154,26 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
154 | 154 | ||
155 | box2 = efl_add(EFL_UI_BOX_CLASS, win, | 155 | box2 = efl_add(EFL_UI_BOX_CLASS, win, |
156 | efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), | 156 | efl_ui_direction_set(efl_added, EFL_UI_DIR_LTR), |
157 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 157 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
158 | efl_pack(box, efl_added)); | 158 | efl_pack(box, efl_added)); |
159 | 159 | ||
160 | // FIXME: button EO API | 160 | // FIXME: button EO API |
161 | efl_add(EFL_UI_BUTTON_CLASS, win, | 161 | efl_add(EFL_UI_BUTTON_CLASS, win, |
162 | efl_text_set(efl_added, "Toggle mask"), | 162 | efl_text_set(efl_added, "Toggle mask"), |
163 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), | 163 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly), |
164 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), | 164 | efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), |
165 | efl_pack(box2, efl_added)); | 165 | efl_pack(box2, efl_added)); |
166 | 166 | ||
167 | efl_add(EFL_UI_BUTTON_CLASS, win, | 167 | efl_add(EFL_UI_BUTTON_CLASS, win, |
168 | efl_text_set(efl_added, "Toggle map"), | 168 | efl_text_set(efl_added, "Toggle map"), |
169 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), | 169 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly), |
170 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), | 170 | efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), |
171 | efl_pack(box2, efl_added)); | 171 | efl_pack(box2, efl_added)); |
172 | 172 | ||
173 | efl_add(EFL_UI_BUTTON_CLASS, win, | 173 | efl_add(EFL_UI_BUTTON_CLASS, win, |
174 | efl_text_set(efl_added, "Rotate Window"), | 174 | efl_text_set(efl_added, "Rotate Window"), |
175 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), | 175 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win), |
176 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), | 176 | efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), |
177 | efl_pack(box2, efl_added)); | 177 | efl_pack(box2, efl_added)); |
178 | 178 | ||
179 | efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600)); | 179 | efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 600)); |
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c index 96b7bc4478..4988702bdb 100644 --- a/src/bin/elementary/test_evas_snapshot.c +++ b/src/bin/elementary/test_evas_snapshot.c | |||
@@ -30,7 +30,7 @@ _image_create(Eo *win, const char *path) | |||
30 | { | 30 | { |
31 | return efl_add(EFL_UI_IMAGE_CLASS, win, | 31 | return efl_add(EFL_UI_IMAGE_CLASS, win, |
32 | efl_file_set(efl_added, path, NULL), | 32 | efl_file_set(efl_added, path, NULL), |
33 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(20, 20))); | 33 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(20, 20))); |
34 | } | 34 | } |
35 | 35 | ||
36 | static void | 36 | static void |
@@ -169,36 +169,36 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
169 | elm_slider_min_max_set(efl_added, 0, 64), | 169 | elm_slider_min_max_set(efl_added, 0, 64), |
170 | elm_slider_value_set(efl_added, 5), | 170 | elm_slider_value_set(efl_added, 5), |
171 | elm_slider_unit_format_set(efl_added, "%.0f px"), | 171 | elm_slider_unit_format_set(efl_added, "%.0f px"), |
172 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 172 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
173 | efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1), | 173 | efl_pack_table(table, efl_added, 0, TABLE_SIZE, TABLE_SIZE, 1), |
174 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); | 174 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _radius_set, win)); |
175 | 175 | ||
176 | box = efl_add(EFL_UI_BOX_CLASS, win, | 176 | box = efl_add(EFL_UI_BOX_CLASS, win, |
177 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 177 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
178 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 178 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
179 | efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1)); | 179 | efl_pack_table(table, efl_added, 0, TABLE_SIZE + 1, TABLE_SIZE, 1)); |
180 | 180 | ||
181 | efl_add(EFL_UI_BUTTON_CLASS, win, | 181 | efl_add(EFL_UI_BUTTON_CLASS, win, |
182 | efl_text_set(efl_added, "Toggle animation"), | 182 | efl_text_set(efl_added, "Toggle animation"), |
183 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 183 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
184 | efl_pack(box, efl_added), | 184 | efl_pack(box, efl_added), |
185 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); | 185 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win)); |
186 | 186 | ||
187 | efl_add(EFL_UI_BUTTON_CLASS, win, | 187 | efl_add(EFL_UI_BUTTON_CLASS, win, |
188 | efl_text_set(efl_added, "Save to file"), | 188 | efl_text_set(efl_added, "Save to file"), |
189 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 189 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
190 | efl_pack(box, efl_added), | 190 | efl_pack(box, efl_added), |
191 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); | 191 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win)); |
192 | 192 | ||
193 | efl_add(EFL_UI_BUTTON_CLASS, win, | 193 | efl_add(EFL_UI_BUTTON_CLASS, win, |
194 | efl_text_set(efl_added, "Map"), | 194 | efl_text_set(efl_added, "Map"), |
195 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 195 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
196 | efl_pack(box, efl_added), | 196 | efl_pack(box, efl_added), |
197 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); | 197 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win)); |
198 | 198 | ||
199 | efl_add(EFL_UI_BUTTON_CLASS, win, | 199 | efl_add(EFL_UI_BUTTON_CLASS, win, |
200 | efl_text_set(efl_added, "Close"), | 200 | efl_text_set(efl_added, "Close"), |
201 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 201 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
202 | efl_pack(box, efl_added), | 202 | efl_pack(box, efl_added), |
203 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); | 203 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win)); |
204 | 204 | ||
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c index 58fd21c4a5..951b98a73e 100644 --- a/src/bin/elementary/test_gfx_filters.c +++ b/src/bin/elementary/test_gfx_filters.c | |||
@@ -248,7 +248,7 @@ _text_resize(void *data EINA_UNUSED, const Efl_Event *ev) | |||
248 | Eina_Size2D sz; | 248 | Eina_Size2D sz; |
249 | 249 | ||
250 | sz = efl_gfx_entity_size_get(ev->object); | 250 | sz = efl_gfx_entity_size_get(ev->object); |
251 | efl_gfx_size_hint_min_set(ev->object, sz); | 251 | efl_gfx_hint_size_min_set(ev->object, sz); |
252 | } | 252 | } |
253 | 253 | ||
254 | static void | 254 | static void |
@@ -258,7 +258,7 @@ _textblock_resize(void *data EINA_UNUSED, const Efl_Event *ev) | |||
258 | 258 | ||
259 | evas_object_textblock_size_native_get(ev->object, &w, &h); | 259 | evas_object_textblock_size_native_get(ev->object, &w, &h); |
260 | evas_object_textblock_style_insets_get(ev->object, &l, &r, &t, &b); | 260 | evas_object_textblock_style_insets_get(ev->object, &l, &r, &t, &b); |
261 | efl_gfx_size_hint_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b)); | 261 | efl_gfx_hint_size_min_set(ev->object, EINA_SIZE2D(w + l + r, h + t + b)); |
262 | } | 262 | } |
263 | 263 | ||
264 | static void | 264 | static void |
@@ -345,28 +345,28 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
345 | { | 345 | { |
346 | box2 = efl_add(EFL_UI_BOX_CLASS, win, | 346 | box2 = efl_add(EFL_UI_BOX_CLASS, win, |
347 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 347 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
348 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 348 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
349 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.0), | 349 | efl_gfx_hint_align_set(efl_added, 0.5, 0.0), |
350 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); | 350 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE)); |
351 | efl_pack(box, box2); | 351 | efl_pack(box, box2); |
352 | 352 | ||
353 | /* FIXME: Efl.Ui.Text doesn't work as expected. */ | 353 | /* FIXME: Efl.Ui.Text doesn't work as expected. */ |
354 | o = efl_add(EFL_UI_TEXT_CLASS, win, | 354 | o = efl_add(EFL_UI_TEXT_CLASS, win, |
355 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), | 355 | efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), |
356 | efl_gfx_size_hint_align_set(efl_added, 1.0, 0.5)); | 356 | efl_gfx_hint_align_set(efl_added, 1.0, 0.5)); |
357 | efl_text_set(o, "Filter:"); | 357 | efl_text_set(o, "Filter:"); |
358 | efl_pack(box2, o); | 358 | efl_pack(box2, o); |
359 | 359 | ||
360 | o = spinner = elm_spinner_add(win); | 360 | o = spinner = elm_spinner_add(win); |
361 | efl_gfx_size_hint_weight_set(o, 1.0, 1.0); | 361 | efl_gfx_hint_weight_set(o, 1.0, 1.0); |
362 | efl_gfx_size_hint_align_set(o, -1.0, 0.5); | 362 | efl_gfx_hint_align_set(o, -1.0, 0.5); |
363 | _spinner_fill(o); | 363 | _spinner_fill(o); |
364 | efl_pack(box2, o); | 364 | efl_pack(box2, o); |
365 | evas_object_show(o); | 365 | evas_object_show(o); |
366 | 366 | ||
367 | o = elm_spinner_add(win); | 367 | o = elm_spinner_add(win); |
368 | efl_gfx_size_hint_weight_set(o, 0.0, 1.0); | 368 | efl_gfx_hint_weight_set(o, 0.0, 1.0); |
369 | efl_gfx_size_hint_align_set(o, -1.0, 0.5); | 369 | efl_gfx_hint_align_set(o, -1.0, 0.5); |
370 | elm_spinner_min_max_set(o, 6, 120); | 370 | elm_spinner_min_max_set(o, 6, 120); |
371 | elm_spinner_value_set(o, default_font_size); | 371 | elm_spinner_value_set(o, default_font_size); |
372 | efl_event_callback_add(o, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win); | 372 | efl_event_callback_add(o, ELM_SPINNER_EVENT_DELAY_CHANGED, _font_size_change, win); |
@@ -375,8 +375,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
375 | 375 | ||
376 | o = efl_add(EFL_UI_BUTTON_CLASS, win, | 376 | o = efl_add(EFL_UI_BUTTON_CLASS, win, |
377 | efl_text_set(efl_added, "Flip"), | 377 | efl_text_set(efl_added, "Flip"), |
378 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 1.0), | 378 | efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), |
379 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 379 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
380 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); | 380 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win)); |
381 | efl_pack(box2, o); | 381 | efl_pack(box2, o); |
382 | } | 382 | } |
@@ -384,10 +384,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
384 | { | 384 | { |
385 | box2 = efl_add(EFL_UI_BOX_CLASS, win, | 385 | box2 = efl_add(EFL_UI_BOX_CLASS, win, |
386 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 386 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
387 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 387 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
388 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 388 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
389 | efl_pack_padding_set(efl_added, 5, 5, 1), | 389 | efl_pack_padding_set(efl_added, 5, 5, 1), |
390 | efl_gfx_size_hint_margin_set(efl_added, 5, 5, 5, 5), | 390 | efl_gfx_hint_margin_set(efl_added, 5, 5, 5, 5), |
391 | efl_pack_align_set(efl_added, 0, 0.5)); | 391 | efl_pack_align_set(efl_added, 0, 0.5)); |
392 | efl_pack(box, box2); | 392 | efl_pack(box, box2); |
393 | 393 | ||
@@ -399,10 +399,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
399 | if (!images[k].path) break; | 399 | if (!images[k].path) break; |
400 | snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), images[k].path); | 400 | snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), images[k].path); |
401 | o = efl_add(EFL_UI_IMAGE_CLASS, win, | 401 | o = efl_add(EFL_UI_IMAGE_CLASS, win, |
402 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), | 402 | efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), |
403 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), | 403 | efl_gfx_hint_align_set(efl_added, 0.5, 0.5), |
404 | efl_gfx_size_hint_max_set(efl_added, size), | 404 | efl_gfx_hint_size_max_set(efl_added, size), |
405 | efl_gfx_size_hint_min_set(efl_added, size), | 405 | efl_gfx_hint_size_min_set(efl_added, size), |
406 | efl_file_set(efl_added, buf, NULL), | 406 | efl_file_set(efl_added, buf, NULL), |
407 | efl_name_set(efl_added, images[k].src_name), | 407 | efl_name_set(efl_added, images[k].src_name), |
408 | elm_object_tooltip_text_set(efl_added, images[k].src_name)); | 408 | elm_object_tooltip_text_set(efl_added, images[k].src_name)); |
@@ -429,10 +429,10 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
429 | }; | 429 | }; |
430 | 430 | ||
431 | o = elm_colorselector_add(win); | 431 | o = elm_colorselector_add(win); |
432 | efl_gfx_size_hint_weight_set(o, 1.0, 0); | 432 | efl_gfx_hint_weight_set(o, 1.0, 0); |
433 | efl_gfx_size_hint_align_set(o, -1.0, 0); | 433 | efl_gfx_hint_align_set(o, -1.0, 0); |
434 | elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PALETTE); | 434 | elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PALETTE); |
435 | efl_gfx_size_hint_max_set(o, maxsz); | 435 | efl_gfx_hint_size_max_set(o, maxsz); |
436 | efl_name_set(o, "myColor"); | 436 | efl_name_set(o, "myColor"); |
437 | elm_object_tooltip_text_set(o, "Pick a color to use as variable 'myColor'"); | 437 | elm_object_tooltip_text_set(o, "Pick a color to use as variable 'myColor'"); |
438 | evas_object_smart_callback_add(o, "changed", _colsel_cb, win); | 438 | evas_object_smart_callback_add(o, "changed", _colsel_cb, win); |
@@ -453,8 +453,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
453 | 453 | ||
454 | box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, | 454 | box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, |
455 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 455 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
456 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 456 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
457 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 457 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
458 | efl_pack_align_set(efl_added, 0.5, 0.5)); | 458 | efl_pack_align_set(efl_added, 0.5, 0.5)); |
459 | efl_pack(flip, box2); | 459 | efl_pack(flip, box2); |
460 | 460 | ||
@@ -469,8 +469,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
469 | 469 | ||
470 | o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, | 470 | o = box2 = efl_add(EFL_UI_BOX_STACK_CLASS, win, |
471 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 471 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
472 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 472 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
473 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 473 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
474 | efl_pack_align_set(efl_added, 0.5, 0.5)); | 474 | efl_pack_align_set(efl_added, 0.5, 0.5)); |
475 | efl_pack(flip, box2); | 475 | efl_pack(flip, box2); |
476 | 476 | ||
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c index 60a83a8c8a..37e39da2c6 100644 --- a/src/bin/elementary/test_part_bg.c +++ b/src/bin/elementary/test_part_bg.c | |||
@@ -63,12 +63,12 @@ _create_box_contents(Evas_Object *box) | |||
63 | 63 | ||
64 | hbox = efl_add(EFL_UI_BOX_CLASS, box, | 64 | hbox = efl_add(EFL_UI_BOX_CLASS, box, |
65 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 65 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
66 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 66 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
67 | efl_pack_end(box, efl_added)); | 67 | efl_pack_end(box, efl_added)); |
68 | 68 | ||
69 | radio_group = radio = efl_add(EFL_UI_RADIO_CLASS, hbox, | 69 | radio_group = radio = efl_add(EFL_UI_RADIO_CLASS, hbox, |
70 | efl_pack_end(hbox, efl_added), | 70 | efl_pack_end(hbox, efl_added), |
71 | efl_gfx_size_hint_weight_set(efl_added, 0, 0), | 71 | efl_gfx_hint_weight_set(efl_added, 0, 0), |
72 | efl_ui_radio_state_value_set(efl_added, 0)); | 72 | efl_ui_radio_state_value_set(efl_added, 0)); |
73 | 73 | ||
74 | content = efl_add(EFL_UI_BOX_CLASS, hbox, | 74 | content = efl_add(EFL_UI_BOX_CLASS, hbox, |
@@ -92,7 +92,7 @@ _create_box_contents(Evas_Object *box) | |||
92 | efl_ui_radio_group_add(efl_added, radio_group), | 92 | efl_ui_radio_group_add(efl_added, radio_group), |
93 | efl_pack_end(hbox, efl_added), | 93 | efl_pack_end(hbox, efl_added), |
94 | efl_ui_radio_state_value_set(efl_added, i + 1), | 94 | efl_ui_radio_state_value_set(efl_added, i + 1), |
95 | efl_gfx_size_hint_weight_set(efl_added, 0, 0)); | 95 | efl_gfx_hint_weight_set(efl_added, 0, 0)); |
96 | 96 | ||
97 | content = efl_add(content_class[i], hbox, | 97 | content = efl_add(content_class[i], hbox, |
98 | efl_pack_end(hbox, efl_added)); | 98 | efl_pack_end(hbox, efl_added)); |
@@ -147,12 +147,12 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
147 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 147 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
148 | 148 | ||
149 | vbox = efl_add(EFL_UI_BOX_CLASS, win, | 149 | vbox = efl_add(EFL_UI_BOX_CLASS, win, |
150 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 150 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
151 | efl_content_set(win, efl_added)); | 151 | efl_content_set(win, efl_added)); |
152 | 152 | ||
153 | hbox = efl_add(EFL_UI_BOX_CLASS, vbox, | 153 | hbox = efl_add(EFL_UI_BOX_CLASS, vbox, |
154 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), | 154 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL), |
155 | efl_gfx_size_hint_weight_set(efl_added, 1.0, 0.0), | 155 | efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), |
156 | efl_pack_end(vbox, efl_added)); | 156 | efl_pack_end(vbox, efl_added)); |
157 | 157 | ||
158 | reset_btn = efl_add(EFL_UI_BUTTON_CLASS, hbox, | 158 | reset_btn = efl_add(EFL_UI_BUTTON_CLASS, hbox, |
@@ -172,7 +172,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
172 | efl_pack_end(vbox, scr); | 172 | efl_pack_end(vbox, scr); |
173 | 173 | ||
174 | vbox = efl_add(EFL_UI_BOX_CLASS, scr, | 174 | vbox = efl_add(EFL_UI_BOX_CLASS, scr, |
175 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 175 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
176 | efl_content_set(scr, efl_added)); | 176 | efl_content_set(scr, efl_added)); |
177 | 177 | ||
178 | radio_group = _create_box_contents(vbox); | 178 | radio_group = _create_box_contents(vbox); |
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c index 2df5f6766b..39d170b03c 100644 --- a/src/bin/elementary/test_part_shadow.c +++ b/src/bin/elementary/test_part_shadow.c | |||
@@ -94,7 +94,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
94 | efl_content_set(win, bx); | 94 | efl_content_set(win, bx); |
95 | 95 | ||
96 | pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); | 96 | pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); |
97 | efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); | 97 | efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0); |
98 | efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); | 98 | efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); |
99 | efl_pack(bx, pb); | 99 | efl_pack(bx, pb); |
100 | td->pb1 = pb; | 100 | td->pb1 = pb; |
@@ -122,7 +122,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
122 | 122 | ||
123 | pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); | 123 | pb = efl_add(EFL_UI_PROGRESSBAR_CLASS, win); |
124 | efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); | 124 | efl_ui_progressbar_pulse_mode_set(pb, EINA_TRUE); |
125 | efl_gfx_size_hint_weight_set(pb, EFL_GFX_SIZE_HINT_EXPAND, 0); | 125 | efl_gfx_hint_weight_set(pb, EFL_GFX_HINT_EXPAND, 0); |
126 | efl_pack(bx, pb); | 126 | efl_pack(bx, pb); |
127 | td->pb4 = pb; | 127 | td->pb4 = pb; |
128 | 128 | ||
@@ -143,7 +143,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
143 | 143 | ||
144 | hbx = efl_add(EFL_UI_BOX_CLASS, win); | 144 | hbx = efl_add(EFL_UI_BOX_CLASS, win); |
145 | efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL); | 145 | efl_ui_direction_set(hbx, EFL_UI_DIR_HORIZONTAL); |
146 | efl_gfx_size_hint_weight_set(hbx, EFL_GFX_SIZE_HINT_EXPAND, 0); | 146 | efl_gfx_hint_weight_set(hbx, EFL_GFX_HINT_EXPAND, 0); |
147 | efl_pack(bx, hbx); | 147 | efl_pack(bx, hbx); |
148 | 148 | ||
149 | // FIXME: Needs wheel progressbar class | 149 | // FIXME: Needs wheel progressbar class |
@@ -176,7 +176,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
176 | 176 | ||
177 | bt_bx = efl_add(EFL_UI_BOX_CLASS, win); | 177 | bt_bx = efl_add(EFL_UI_BOX_CLASS, win); |
178 | efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL); | 178 | efl_ui_direction_set(bt_bx, EFL_UI_DIR_HORIZONTAL); |
179 | efl_gfx_size_hint_weight_set(bt_bx, EFL_GFX_SIZE_HINT_EXPAND, 0); | 179 | efl_gfx_hint_weight_set(bt_bx, EFL_GFX_HINT_EXPAND, 0); |
180 | efl_pack(bx, bt_bx); | 180 | efl_pack(bx, bt_bx); |
181 | 181 | ||
182 | bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); | 182 | bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); |
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c index 9c54b01207..79f6799020 100644 --- a/src/bin/elementary/test_photocam.c +++ b/src/bin/elementary/test_photocam.c | |||
@@ -816,7 +816,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE | |||
816 | efl_add(EFL_UI_TEXT_CLASS, bx, | 816 | efl_add(EFL_UI_TEXT_CLASS, bx, |
817 | efl_text_set(efl_added, "Clicking the image will play/pause animation."), | 817 | efl_text_set(efl_added, "Clicking the image will play/pause animation."), |
818 | efl_text_interactive_editable_set(efl_added, EINA_FALSE), | 818 | efl_text_interactive_editable_set(efl_added, EINA_FALSE), |
819 | efl_gfx_size_hint_weight_set(efl_added, 1, 0), | 819 | efl_gfx_hint_weight_set(efl_added, 1, 0), |
820 | efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"), | 820 | efl_canvas_text_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"), |
821 | efl_pack(bx, efl_added) | 821 | efl_pack(bx, efl_added) |
822 | ); | 822 | ); |
diff --git a/src/bin/elementary/test_ui_box.c b/src/bin/elementary/test_ui_box.c index 58194a4099..d3cfc1c412 100644 --- a/src/bin/elementary/test_ui_box.c +++ b/src/bin/elementary/test_ui_box.c | |||
@@ -26,36 +26,36 @@ weights_cb(void *data, const Efl_Event *event) | |||
26 | switch (mode) | 26 | switch (mode) |
27 | { | 27 | { |
28 | case NONE: | 28 | case NONE: |
29 | efl_gfx_size_hint_align_set(data, 0.5, 0.5); | 29 | efl_gfx_hint_align_set(data, 0.5, 0.5); |
30 | for (int i = 0; i < CNT; i++) | 30 | for (int i = 0; i < CNT; i++) |
31 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 31 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
32 | break; | 32 | break; |
33 | case NONE_BUT_FILL: | 33 | case NONE_BUT_FILL: |
34 | efl_gfx_size_hint_align_set(data, -1, -1); | 34 | efl_gfx_hint_align_set(data, -1, -1); |
35 | for (int i = 0; i < CNT; i++) | 35 | for (int i = 0; i < CNT; i++) |
36 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 36 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
37 | break; | 37 | break; |
38 | case EQUAL: | 38 | case EQUAL: |
39 | efl_gfx_size_hint_align_set(data, 0.5, 0.5); | 39 | efl_gfx_hint_align_set(data, 0.5, 0.5); |
40 | for (int i = 0; i < CNT; i++) | 40 | for (int i = 0; i < CNT; i++) |
41 | efl_gfx_size_hint_weight_set(objects[i], 1, 1); | 41 | efl_gfx_hint_weight_set(objects[i], 1, 1); |
42 | break; | 42 | break; |
43 | case ONE: | 43 | case ONE: |
44 | efl_gfx_size_hint_align_set(data, 0.5, 0.5); | 44 | efl_gfx_hint_align_set(data, 0.5, 0.5); |
45 | for (int i = 0; i < 6; i++) | 45 | for (int i = 0; i < 6; i++) |
46 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 46 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
47 | efl_gfx_size_hint_weight_set(objects[6], 1, 1); | 47 | efl_gfx_hint_weight_set(objects[6], 1, 1); |
48 | for (int i = 7; i < CNT; i++) | 48 | for (int i = 7; i < CNT; i++) |
49 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 49 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
50 | break; | 50 | break; |
51 | case TWO: | 51 | case TWO: |
52 | efl_gfx_size_hint_align_set(data, 0.5, 0.5); | 52 | efl_gfx_hint_align_set(data, 0.5, 0.5); |
53 | for (int i = 0; i < 5; i++) | 53 | for (int i = 0; i < 5; i++) |
54 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 54 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
55 | efl_gfx_size_hint_weight_set(objects[5], 1, 1); | 55 | efl_gfx_hint_weight_set(objects[5], 1, 1); |
56 | efl_gfx_size_hint_weight_set(objects[6], 1, 1); | 56 | efl_gfx_hint_weight_set(objects[6], 1, 1); |
57 | for (int i = 7; i < CNT; i++) | 57 | for (int i = 7; i < CNT; i++) |
58 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 58 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
59 | break; | 59 | break; |
60 | } | 60 | } |
61 | } | 61 | } |
@@ -65,7 +65,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) | |||
65 | { | 65 | { |
66 | int val = elm_slider_value_get(event->object); | 66 | int val = elm_slider_value_get(event->object); |
67 | 67 | ||
68 | efl_gfx_size_hint_min_set(objects[3], EINA_SIZE2D(val, val)); | 68 | efl_gfx_hint_size_min_set(objects[3], EINA_SIZE2D(val, val)); |
69 | } | 69 | } |
70 | 70 | ||
71 | static void | 71 | static void |
@@ -85,7 +85,7 @@ margin_slider_cb(void *data, const Efl_Event *event) | |||
85 | Eo *win = data, *box; | 85 | Eo *win = data, *box; |
86 | 86 | ||
87 | box = efl_key_wref_get(win, "box"); | 87 | box = efl_key_wref_get(win, "box"); |
88 | efl_gfx_size_hint_margin_set(box, val, val, val, val); | 88 | efl_gfx_hint_margin_set(box, val, val, val, val); |
89 | } | 89 | } |
90 | 90 | ||
91 | static void | 91 | static void |
@@ -120,8 +120,8 @@ alignh_btn_slider_cb(void *data, const Efl_Event *event) | |||
120 | 120 | ||
121 | btn = efl_key_wref_get(win, "button"); | 121 | btn = efl_key_wref_get(win, "button"); |
122 | val = elm_slider_value_get(event->object); | 122 | val = elm_slider_value_get(event->object); |
123 | efl_gfx_size_hint_align_get(btn, NULL, &av); | 123 | efl_gfx_hint_align_get(btn, NULL, &av); |
124 | efl_gfx_size_hint_align_set(btn, val, av); | 124 | efl_gfx_hint_align_set(btn, val, av); |
125 | } | 125 | } |
126 | 126 | ||
127 | static void | 127 | static void |
@@ -132,8 +132,8 @@ alignv_btn_slider_cb(void *data, const Efl_Event *event) | |||
132 | 132 | ||
133 | btn = efl_key_wref_get(win, "button"); | 133 | btn = efl_key_wref_get(win, "button"); |
134 | val = elm_slider_value_get(event->object); | 134 | val = elm_slider_value_get(event->object); |
135 | efl_gfx_size_hint_align_get(btn, &ah, NULL); | 135 | efl_gfx_hint_align_get(btn, &ah, NULL); |
136 | efl_gfx_size_hint_align_set(btn, ah, val); | 136 | efl_gfx_hint_align_set(btn, ah, val); |
137 | } | 137 | } |
138 | 138 | ||
139 | static void | 139 | static void |
@@ -209,7 +209,7 @@ _custom_layout_update(Eo *pack, const void *data EINA_UNUSED) | |||
209 | 209 | ||
210 | r.x = (rp.w / count) * i; | 210 | r.x = (rp.w / count) * i; |
211 | r.y = (rp.h / count) * i; | 211 | r.y = (rp.h / count) * i; |
212 | r.size = efl_gfx_size_hint_combined_min_get(sobj); | 212 | r.size = efl_gfx_hint_size_combined_min_get(sobj); |
213 | efl_gfx_entity_geometry_set(sobj, r); | 213 | efl_gfx_entity_geometry_set(sobj, r); |
214 | i++; | 214 | i++; |
215 | } | 215 | } |
@@ -248,15 +248,15 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
248 | vbox = efl_add(EFL_UI_BOX_CLASS, win, | 248 | vbox = efl_add(EFL_UI_BOX_CLASS, win, |
249 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 249 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
250 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); | 250 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); |
251 | efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); | 251 | efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); |
252 | elm_win_resize_object_add(win, vbox); | 252 | elm_win_resize_object_add(win, vbox); |
253 | 253 | ||
254 | 254 | ||
255 | /* controls */ | 255 | /* controls */ |
256 | f = elm_frame_add(win); | 256 | f = elm_frame_add(win); |
257 | elm_object_text_set(f, "Controls"); | 257 | elm_object_text_set(f, "Controls"); |
258 | efl_gfx_size_hint_align_set(f, -1, -1); | 258 | efl_gfx_hint_align_set(f, -1, -1); |
259 | efl_gfx_size_hint_weight_set(f, 1, 0); | 259 | efl_gfx_hint_weight_set(f, 1, 0); |
260 | efl_pack(vbox, f); | 260 | efl_pack(vbox, f); |
261 | efl_gfx_entity_visible_set(f, 1); | 261 | efl_gfx_entity_visible_set(f, 1); |
262 | 262 | ||
@@ -269,14 +269,14 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
269 | /* weights radio group */ | 269 | /* weights radio group */ |
270 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 270 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
271 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 271 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
272 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 272 | efl_gfx_hint_align_set(bx, 0, 0.5); |
273 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 273 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
274 | efl_pack(hbox, bx); | 274 | efl_pack(hbox, bx); |
275 | 275 | ||
276 | chk = o = elm_radio_add(win); | 276 | chk = o = elm_radio_add(win); |
277 | elm_object_text_set(o, "No weight"); | 277 | elm_object_text_set(o, "No weight"); |
278 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); | 278 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); |
279 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 279 | efl_gfx_hint_align_set(o, 0, 0.5); |
280 | elm_radio_state_value_set(o, NONE); | 280 | elm_radio_state_value_set(o, NONE); |
281 | efl_pack(bx, o); | 281 | efl_pack(bx, o); |
282 | efl_gfx_entity_visible_set(o, 1); | 282 | efl_gfx_entity_visible_set(o, 1); |
@@ -284,7 +284,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
284 | o = elm_radio_add(win); | 284 | o = elm_radio_add(win); |
285 | elm_object_text_set(o, "No weight + box fill"); | 285 | elm_object_text_set(o, "No weight + box fill"); |
286 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); | 286 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); |
287 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 287 | efl_gfx_hint_align_set(o, 0, 0.5); |
288 | elm_radio_state_value_set(o, NONE_BUT_FILL); | 288 | elm_radio_state_value_set(o, NONE_BUT_FILL); |
289 | elm_radio_group_add(o, chk); | 289 | elm_radio_group_add(o, chk); |
290 | efl_pack(bx, o); | 290 | efl_pack(bx, o); |
@@ -293,7 +293,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
293 | o = elm_radio_add(win); | 293 | o = elm_radio_add(win); |
294 | elm_object_text_set(o, "Equal weights"); | 294 | elm_object_text_set(o, "Equal weights"); |
295 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); | 295 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); |
296 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 296 | efl_gfx_hint_align_set(o, 0, 0.5); |
297 | elm_radio_state_value_set(o, EQUAL); | 297 | elm_radio_state_value_set(o, EQUAL); |
298 | elm_radio_group_add(o, chk); | 298 | elm_radio_group_add(o, chk); |
299 | efl_pack(bx, o); | 299 | efl_pack(bx, o); |
@@ -302,7 +302,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
302 | o = elm_radio_add(win); | 302 | o = elm_radio_add(win); |
303 | elm_object_text_set(o, "One weight only"); | 303 | elm_object_text_set(o, "One weight only"); |
304 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); | 304 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); |
305 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 305 | efl_gfx_hint_align_set(o, 0, 0.5); |
306 | elm_radio_state_value_set(o, ONE); | 306 | elm_radio_state_value_set(o, ONE); |
307 | elm_radio_group_add(o, chk); | 307 | elm_radio_group_add(o, chk); |
308 | efl_pack(bx, o); | 308 | efl_pack(bx, o); |
@@ -311,7 +311,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
311 | o = elm_radio_add(win); | 311 | o = elm_radio_add(win); |
312 | elm_object_text_set(o, "Two weights"); | 312 | elm_object_text_set(o, "Two weights"); |
313 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); | 313 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, win); |
314 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 314 | efl_gfx_hint_align_set(o, 0, 0.5); |
315 | elm_radio_state_value_set(o, TWO); | 315 | elm_radio_state_value_set(o, TWO); |
316 | elm_radio_group_add(o, chk); | 316 | elm_radio_group_add(o, chk); |
317 | efl_pack(bx, o); | 317 | efl_pack(bx, o); |
@@ -323,9 +323,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
323 | /* misc */ | 323 | /* misc */ |
324 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 324 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
325 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 325 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
326 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 326 | efl_gfx_hint_align_set(bx, 0, 0.5); |
327 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 327 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
328 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 328 | efl_gfx_hint_weight_set(bx, 0, 1); |
329 | efl_pack(hbox, bx); | 329 | efl_pack(hbox, bx); |
330 | 330 | ||
331 | o = elm_label_add(win); | 331 | o = elm_label_add(win); |
@@ -337,7 +337,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
337 | elm_check_selected_set(o, 0); | 337 | elm_check_selected_set(o, 0); |
338 | elm_object_text_set(o, "Flow"); | 338 | elm_object_text_set(o, "Flow"); |
339 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); | 339 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, flow_check_cb, win); |
340 | efl_gfx_size_hint_align_set(o, 0, 0); | 340 | efl_gfx_hint_align_set(o, 0, 0); |
341 | efl_pack(bx, o); | 341 | efl_pack(bx, o); |
342 | efl_gfx_entity_visible_set(o, 1); | 342 | efl_gfx_entity_visible_set(o, 1); |
343 | 343 | ||
@@ -345,7 +345,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
345 | elm_check_selected_set(o, 1); | 345 | elm_check_selected_set(o, 1); |
346 | elm_object_text_set(o, "Horizontal"); | 346 | elm_object_text_set(o, "Horizontal"); |
347 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); | 347 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, horiz_check_cb, win); |
348 | efl_gfx_size_hint_align_set(o, 0, 0); | 348 | efl_gfx_hint_align_set(o, 0, 0); |
349 | efl_pack(bx, o); | 349 | efl_pack(bx, o); |
350 | efl_gfx_entity_visible_set(o, 1); | 350 | efl_gfx_entity_visible_set(o, 1); |
351 | 351 | ||
@@ -353,7 +353,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
353 | elm_check_selected_set(o, 0); | 353 | elm_check_selected_set(o, 0); |
354 | elm_object_text_set(o, "Homogenous"); | 354 | elm_object_text_set(o, "Homogenous"); |
355 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); | 355 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, homo_check_cb, win); |
356 | efl_gfx_size_hint_align_set(o, 0, 0); | 356 | efl_gfx_hint_align_set(o, 0, 0); |
357 | efl_pack(bx, o); | 357 | efl_pack(bx, o); |
358 | efl_gfx_entity_visible_set(o, 1); | 358 | efl_gfx_entity_visible_set(o, 1); |
359 | 359 | ||
@@ -361,7 +361,7 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
361 | elm_check_selected_set(o, 0); | 361 | elm_check_selected_set(o, 0); |
362 | elm_object_text_set(o, "Homogenous + Max"); | 362 | elm_object_text_set(o, "Homogenous + Max"); |
363 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); | 363 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, max_size_check_cb, win); |
364 | efl_gfx_size_hint_align_set(o, 0, 0); | 364 | efl_gfx_hint_align_set(o, 0, 0); |
365 | efl_pack(bx, o); | 365 | efl_pack(bx, o); |
366 | efl_gfx_entity_visible_set(o, 1); | 366 | efl_gfx_entity_visible_set(o, 1); |
367 | 367 | ||
@@ -369,8 +369,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
369 | elm_check_selected_set(o, 0); | 369 | elm_check_selected_set(o, 0); |
370 | elm_object_text_set(o, "Custom layout"); | 370 | elm_object_text_set(o, "Custom layout"); |
371 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, win); | 371 | efl_event_callback_add(o, EFL_UI_CHECK_EVENT_CHANGED, custom_check_cb, win); |
372 | efl_gfx_size_hint_align_set(o, 0, 0); | 372 | efl_gfx_hint_align_set(o, 0, 0); |
373 | efl_gfx_size_hint_weight_set(o, 0, 1); | 373 | efl_gfx_hint_weight_set(o, 0, 1); |
374 | efl_pack(bx, o); | 374 | efl_pack(bx, o); |
375 | efl_gfx_entity_visible_set(o, 1); | 375 | efl_gfx_entity_visible_set(o, 1); |
376 | 376 | ||
@@ -378,9 +378,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
378 | /* user min size setter */ | 378 | /* user min size setter */ |
379 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 379 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
380 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 380 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
381 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 381 | efl_gfx_hint_align_set(bx, 0, 0.5); |
382 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 382 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
383 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 383 | efl_gfx_hint_weight_set(bx, 0, 1); |
384 | efl_pack(hbox, bx); | 384 | efl_pack(hbox, bx); |
385 | 385 | ||
386 | o = elm_label_add(win); | 386 | o = elm_label_add(win); |
@@ -392,8 +392,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
392 | elm_slider_indicator_format_set(o, "%.0fpx"); | 392 | elm_slider_indicator_format_set(o, "%.0fpx"); |
393 | elm_slider_indicator_show_set(o, 1); | 393 | elm_slider_indicator_show_set(o, 1); |
394 | elm_slider_horizontal_set(o, 0); | 394 | elm_slider_horizontal_set(o, 0); |
395 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 395 | efl_gfx_hint_align_set(o, 0.5, -1); |
396 | efl_gfx_size_hint_weight_set(o, 1, 1); | 396 | efl_gfx_hint_weight_set(o, 1, 1); |
397 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); | 397 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); |
398 | elm_slider_min_max_set(o, 0, 250); | 398 | elm_slider_min_max_set(o, 0, 250); |
399 | elm_slider_inverted_set(o, 1); | 399 | elm_slider_inverted_set(o, 1); |
@@ -405,9 +405,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
405 | /* inner box padding */ | 405 | /* inner box padding */ |
406 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 406 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
407 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 407 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
408 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 408 | efl_gfx_hint_align_set(bx, 0, 0.5); |
409 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 409 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
410 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 410 | efl_gfx_hint_weight_set(bx, 0, 1); |
411 | efl_pack(hbox, bx); | 411 | efl_pack(hbox, bx); |
412 | 412 | ||
413 | o = elm_label_add(win); | 413 | o = elm_label_add(win); |
@@ -419,8 +419,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
419 | elm_slider_indicator_format_set(o, "%.0fpx"); | 419 | elm_slider_indicator_format_set(o, "%.0fpx"); |
420 | elm_slider_indicator_show_set(o, 1); | 420 | elm_slider_indicator_show_set(o, 1); |
421 | elm_slider_horizontal_set(o, 0); | 421 | elm_slider_horizontal_set(o, 0); |
422 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 422 | efl_gfx_hint_align_set(o, 0.5, -1); |
423 | efl_gfx_size_hint_weight_set(o, 1, 1); | 423 | efl_gfx_hint_weight_set(o, 1, 1); |
424 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win); | 424 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, win); |
425 | elm_slider_min_max_set(o, 0, 40); | 425 | elm_slider_min_max_set(o, 0, 40); |
426 | elm_slider_inverted_set(o, 1); | 426 | elm_slider_inverted_set(o, 1); |
@@ -432,9 +432,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
432 | /* outer margin */ | 432 | /* outer margin */ |
433 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 433 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
434 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 434 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
435 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 435 | efl_gfx_hint_align_set(bx, 0, 0.5); |
436 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 436 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
437 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 437 | efl_gfx_hint_weight_set(bx, 0, 1); |
438 | efl_pack(hbox, bx); | 438 | efl_pack(hbox, bx); |
439 | 439 | ||
440 | o = elm_label_add(win); | 440 | o = elm_label_add(win); |
@@ -446,8 +446,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
446 | elm_slider_indicator_format_set(o, "%.0fpx"); | 446 | elm_slider_indicator_format_set(o, "%.0fpx"); |
447 | elm_slider_indicator_show_set(o, 1); | 447 | elm_slider_indicator_show_set(o, 1); |
448 | elm_slider_horizontal_set(o, 0); | 448 | elm_slider_horizontal_set(o, 0); |
449 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 449 | efl_gfx_hint_align_set(o, 0.5, -1); |
450 | efl_gfx_size_hint_weight_set(o, 1, 1); | 450 | efl_gfx_hint_weight_set(o, 1, 1); |
451 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win); | 451 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, win); |
452 | elm_slider_min_max_set(o, 0, 40); | 452 | elm_slider_min_max_set(o, 0, 40); |
453 | elm_slider_inverted_set(o, 1); | 453 | elm_slider_inverted_set(o, 1); |
@@ -459,9 +459,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
459 | /* Box align */ | 459 | /* Box align */ |
460 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 460 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
461 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 461 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
462 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 462 | efl_gfx_hint_align_set(bx, 0, 0.5); |
463 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 463 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
464 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 464 | efl_gfx_hint_weight_set(bx, 1, 1); |
465 | efl_pack(hbox, bx); | 465 | efl_pack(hbox, bx); |
466 | 466 | ||
467 | o = elm_label_add(win); | 467 | o = elm_label_add(win); |
@@ -473,8 +473,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
473 | elm_slider_indicator_format_set(o, "%.1f"); | 473 | elm_slider_indicator_format_set(o, "%.1f"); |
474 | elm_slider_indicator_show_set(o, 1); | 474 | elm_slider_indicator_show_set(o, 1); |
475 | elm_slider_horizontal_set(o, 0); | 475 | elm_slider_horizontal_set(o, 0); |
476 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 476 | efl_gfx_hint_align_set(o, 0.5, -1); |
477 | efl_gfx_size_hint_weight_set(o, 1, 1); | 477 | efl_gfx_hint_weight_set(o, 1, 1); |
478 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); | 478 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, win); |
479 | elm_slider_min_max_set(o, -0.1, 1.0); | 479 | elm_slider_min_max_set(o, -0.1, 1.0); |
480 | elm_slider_step_set(o, 0.1); | 480 | elm_slider_step_set(o, 0.1); |
@@ -486,9 +486,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
486 | elm_slider_indicator_format_set(o, "%.1f"); | 486 | elm_slider_indicator_format_set(o, "%.1f"); |
487 | elm_slider_indicator_show_set(o, 1); | 487 | elm_slider_indicator_show_set(o, 1); |
488 | elm_slider_horizontal_set(o, 1); | 488 | elm_slider_horizontal_set(o, 1); |
489 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 489 | efl_gfx_hint_align_set(o, 0.5, -1); |
490 | efl_gfx_size_hint_weight_set(o, 1, 0); | 490 | efl_gfx_hint_weight_set(o, 1, 0); |
491 | efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); | 491 | efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); |
492 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); | 492 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, win); |
493 | elm_slider_min_max_set(o, -0.1, 1.0); | 493 | elm_slider_min_max_set(o, -0.1, 1.0); |
494 | elm_slider_step_set(o, 0.1); | 494 | elm_slider_step_set(o, 0.1); |
@@ -499,9 +499,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
499 | /* Button align */ | 499 | /* Button align */ |
500 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 500 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
501 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 501 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
502 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 502 | efl_gfx_hint_align_set(bx, 0, 0.5); |
503 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 503 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
504 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 504 | efl_gfx_hint_weight_set(bx, 1, 1); |
505 | efl_pack(hbox, bx); | 505 | efl_pack(hbox, bx); |
506 | 506 | ||
507 | o = elm_label_add(win); | 507 | o = elm_label_add(win); |
@@ -513,8 +513,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
513 | elm_slider_indicator_format_set(o, "%.1f"); | 513 | elm_slider_indicator_format_set(o, "%.1f"); |
514 | elm_slider_indicator_show_set(o, 1); | 514 | elm_slider_indicator_show_set(o, 1); |
515 | elm_slider_horizontal_set(o, 0); | 515 | elm_slider_horizontal_set(o, 0); |
516 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 516 | efl_gfx_hint_align_set(o, 0.5, -1); |
517 | efl_gfx_size_hint_weight_set(o, 1, 1); | 517 | efl_gfx_hint_weight_set(o, 1, 1); |
518 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win); | 518 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_btn_slider_cb, win); |
519 | elm_slider_min_max_set(o, 0.0, 1.0); | 519 | elm_slider_min_max_set(o, 0.0, 1.0); |
520 | elm_slider_step_set(o, 0.1); | 520 | elm_slider_step_set(o, 0.1); |
@@ -526,9 +526,9 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
526 | elm_slider_indicator_format_set(o, "%.1f"); | 526 | elm_slider_indicator_format_set(o, "%.1f"); |
527 | elm_slider_indicator_show_set(o, 1); | 527 | elm_slider_indicator_show_set(o, 1); |
528 | elm_slider_horizontal_set(o, 1); | 528 | elm_slider_horizontal_set(o, 1); |
529 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 529 | efl_gfx_hint_align_set(o, 0.5, -1); |
530 | efl_gfx_size_hint_weight_set(o, 1, 0); | 530 | efl_gfx_hint_weight_set(o, 1, 0); |
531 | efl_gfx_size_hint_min_set(o, EINA_SIZE2D(100, 0)); | 531 | efl_gfx_hint_size_min_set(o, EINA_SIZE2D(100, 0)); |
532 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win); | 532 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_btn_slider_cb, win); |
533 | elm_slider_min_max_set(o, -0.1, 1.0); | 533 | elm_slider_min_max_set(o, -0.1, 1.0); |
534 | elm_slider_step_set(o, 0.1); | 534 | elm_slider_step_set(o, 0.1); |
@@ -540,8 +540,8 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
540 | /* contents */ | 540 | /* contents */ |
541 | f = elm_frame_add(win); | 541 | f = elm_frame_add(win); |
542 | elm_object_text_set(f, "Contents"); | 542 | elm_object_text_set(f, "Contents"); |
543 | efl_gfx_size_hint_align_set(f, -1, -1); | 543 | efl_gfx_hint_align_set(f, -1, -1); |
544 | efl_gfx_size_hint_weight_set(f, 1, 1); | 544 | efl_gfx_hint_weight_set(f, 1, 1); |
545 | efl_pack(vbox, f); | 545 | efl_pack(vbox, f); |
546 | efl_gfx_entity_visible_set(f, 1); | 546 | efl_gfx_entity_visible_set(f, 1); |
547 | 547 | ||
@@ -549,82 +549,82 @@ test_ui_box(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in | |||
549 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); | 549 | efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL)); |
550 | efl_key_wref_set(win, "box", bx); | 550 | efl_key_wref_set(win, "box", bx); |
551 | efl_pack_padding_set(bx, 10, 10, EINA_TRUE); | 551 | efl_pack_padding_set(bx, 10, 10, EINA_TRUE); |
552 | efl_gfx_size_hint_align_set(bx, 0.5, 0.5); | 552 | efl_gfx_hint_align_set(bx, 0.5, 0.5); |
553 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 553 | efl_gfx_hint_weight_set(bx, 1, 1); |
554 | efl_content_set(f, bx); | 554 | efl_content_set(f, bx); |
555 | 555 | ||
556 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 556 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
557 | efl_text_set(o, "Btn1"); | 557 | efl_text_set(o, "Btn1"); |
558 | efl_gfx_size_hint_weight_set(o, 0, 0); | 558 | efl_gfx_hint_weight_set(o, 0, 0); |
559 | efl_gfx_size_hint_align_set(o, 0.5, 0.5); | 559 | efl_gfx_hint_align_set(o, 0.5, 0.5); |
560 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 560 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
561 | efl_pack(bx, o); | 561 | efl_pack(bx, o); |
562 | efl_gfx_entity_visible_set(o, 1); | 562 | efl_gfx_entity_visible_set(o, 1); |
563 | 563 | ||
564 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 564 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
565 | efl_text_set(o, "Button 2"); | 565 | efl_text_set(o, "Button 2"); |
566 | efl_gfx_size_hint_weight_set(o, 0, 0); | 566 | efl_gfx_hint_weight_set(o, 0, 0); |
567 | efl_pack(bx, o); | 567 | efl_pack(bx, o); |
568 | efl_gfx_entity_visible_set(o, 1); | 568 | efl_gfx_entity_visible_set(o, 1); |
569 | 569 | ||
570 | objects[i++] = o = elm_label_add(win); | 570 | objects[i++] = o = elm_label_add(win); |
571 | elm_label_line_wrap_set(o, ELM_WRAP_WORD); | 571 | elm_label_line_wrap_set(o, ELM_WRAP_WORD); |
572 | elm_object_text_set(o, "This label is not marked as fill"); | 572 | elm_object_text_set(o, "This label is not marked as fill"); |
573 | efl_gfx_size_hint_align_set(o, 0.5, 0.5); | 573 | efl_gfx_hint_align_set(o, 0.5, 0.5); |
574 | efl_pack(bx, o); | 574 | efl_pack(bx, o); |
575 | efl_gfx_entity_visible_set(o, 1); | 575 | efl_gfx_entity_visible_set(o, 1); |
576 | 576 | ||
577 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 577 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
578 | efl_text_set(o, "Min size"); | 578 | efl_text_set(o, "Min size"); |
579 | efl_gfx_size_hint_weight_set(o, 0, 0); | 579 | efl_gfx_hint_weight_set(o, 0, 0); |
580 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 580 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
581 | efl_gfx_size_hint_align_set(o, 0.5, 1.0); | 581 | efl_gfx_hint_align_set(o, 0.5, 1.0); |
582 | efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); | 582 | efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 1)); |
583 | efl_pack(bx, o); | 583 | efl_pack(bx, o); |
584 | efl_gfx_entity_visible_set(o, 1); | 584 | efl_gfx_entity_visible_set(o, 1); |
585 | 585 | ||
586 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 586 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
587 | efl_text_set(o, "Quit!"); | 587 | efl_text_set(o, "Quit!"); |
588 | efl_gfx_size_hint_weight_set(o, 0, 0); | 588 | efl_gfx_hint_weight_set(o, 0, 0); |
589 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 589 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
590 | efl_gfx_size_hint_align_set(o, 0.5, 0.0); | 590 | efl_gfx_hint_align_set(o, 0.5, 0.0); |
591 | efl_pack(bx, o); | 591 | efl_pack(bx, o); |
592 | efl_gfx_entity_visible_set(o, 1); | 592 | efl_gfx_entity_visible_set(o, 1); |
593 | 593 | ||
594 | objects[i++] = o = elm_label_add(win); | 594 | objects[i++] = o = elm_label_add(win); |
595 | elm_label_line_wrap_set(o, ELM_WRAP_WORD); | 595 | elm_label_line_wrap_set(o, ELM_WRAP_WORD); |
596 | elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill."); | 596 | elm_object_text_set(o, "This label on the other hand<br/>is marked as align=fill."); |
597 | efl_gfx_size_hint_align_set(o, -1, -1); | 597 | efl_gfx_hint_align_set(o, -1, -1); |
598 | efl_pack(bx, o); | 598 | efl_pack(bx, o); |
599 | efl_gfx_entity_visible_set(o, 1); | 599 | efl_gfx_entity_visible_set(o, 1); |
600 | 600 | ||
601 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 601 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
602 | efl_key_wref_set(win, "button", o); | 602 | efl_key_wref_set(win, "button", o); |
603 | efl_text_set(o, "Button with a quite long text."); | 603 | efl_text_set(o, "Button with a quite long text."); |
604 | efl_gfx_size_hint_weight_set(o, 0, 0); | 604 | efl_gfx_hint_weight_set(o, 0, 0); |
605 | efl_gfx_size_hint_max_set(o, EINA_SIZE2D(200, 100)); | 605 | efl_gfx_hint_size_max_set(o, EINA_SIZE2D(200, 100)); |
606 | efl_pack(bx, o); | 606 | efl_pack(bx, o); |
607 | efl_gfx_entity_visible_set(o, 1); | 607 | efl_gfx_entity_visible_set(o, 1); |
608 | 608 | ||
609 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 609 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
610 | efl_text_set(o, "BtnA"); | 610 | efl_text_set(o, "BtnA"); |
611 | efl_gfx_size_hint_weight_set(o, 0, 0); | 611 | efl_gfx_hint_weight_set(o, 0, 0); |
612 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 612 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
613 | efl_gfx_size_hint_aspect_set(o, EFL_GFX_SIZE_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); | 613 | efl_gfx_hint_aspect_set(o, EFL_GFX_HINT_ASPECT_BOTH, EINA_SIZE2D(1, 2)); |
614 | efl_pack(bx, o); | 614 | efl_pack(bx, o); |
615 | efl_gfx_entity_visible_set(o, 1); | 615 | efl_gfx_entity_visible_set(o, 1); |
616 | 616 | ||
617 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 617 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
618 | efl_text_set(o, "BtnB"); | 618 | efl_text_set(o, "BtnB"); |
619 | efl_gfx_size_hint_weight_set(o, 0, 0); | 619 | efl_gfx_hint_weight_set(o, 0, 0); |
620 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 620 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
621 | efl_pack(bx, o); | 621 | efl_pack(bx, o); |
622 | efl_gfx_entity_visible_set(o, 1); | 622 | efl_gfx_entity_visible_set(o, 1); |
623 | 623 | ||
624 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); | 624 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, bx); |
625 | efl_text_set(o, "BtnC"); | 625 | efl_text_set(o, "BtnC"); |
626 | efl_gfx_size_hint_weight_set(o, 0, 0); | 626 | efl_gfx_hint_weight_set(o, 0, 0); |
627 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 627 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
628 | efl_pack(bx, o); | 628 | efl_pack(bx, o); |
629 | efl_gfx_entity_visible_set(o, 1); | 629 | efl_gfx_entity_visible_set(o, 1); |
630 | 630 | ||
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c index fc20112c04..4a0fa1182b 100644 --- a/src/bin/elementary/test_ui_clock.c +++ b/src/bin/elementary/test_ui_clock.c | |||
@@ -54,11 +54,11 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
54 | 54 | ||
55 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 55 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
56 | efl_content_set(win, efl_added), | 56 | efl_content_set(win, efl_added), |
57 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(360, 240))); | 57 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(360, 240))); |
58 | 58 | ||
59 | dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, | 59 | dt1 = efl_add(EFL_UI_CLOCK_CLASS, bx, |
60 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 60 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
61 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 61 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
62 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), | 62 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), |
63 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), | 63 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), |
64 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), | 64 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), |
@@ -69,8 +69,8 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
69 | efl_pack(bx, efl_added)); | 69 | efl_pack(bx, efl_added)); |
70 | 70 | ||
71 | dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, | 71 | dt2 = efl_add(EFL_UI_CLOCK_CLASS, bx, |
72 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 72 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
73 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 73 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
74 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), | 74 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_YEAR, EINA_FALSE), |
75 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), | 75 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MONTH, EINA_FALSE), |
76 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), | 76 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_DATE, EINA_FALSE), |
@@ -80,21 +80,21 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
80 | elm_object_disabled_set(dt2, EINA_TRUE); | 80 | elm_object_disabled_set(dt2, EINA_TRUE); |
81 | 81 | ||
82 | dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, | 82 | dt3 = efl_add(EFL_UI_CLOCK_CLASS, bx, |
83 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 83 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
84 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 84 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
85 | efl_pack(bx, efl_added)); | 85 | efl_pack(bx, efl_added)); |
86 | 86 | ||
87 | efl_add(EFL_UI_TEXT_CLASS, bx, | 87 | efl_add(EFL_UI_TEXT_CLASS, bx, |
88 | efl_text_set(efl_added, "Editable Clock:"), | 88 | efl_text_set(efl_added, "Editable Clock:"), |
89 | efl_gfx_size_hint_weight_set(efl_added, 0.0, 0.0), | 89 | efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), |
90 | efl_gfx_size_hint_align_set(efl_added, 0, 0.5), | 90 | efl_gfx_hint_align_set(efl_added, 0, 0.5), |
91 | efl_gfx_size_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE), | 91 | efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_TRUE), |
92 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 25)), | 92 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 25)), |
93 | efl_pack(bx, efl_added)); | 93 | efl_pack(bx, efl_added)); |
94 | 94 | ||
95 | dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, | 95 | dt4 = efl_add(EFL_UI_CLOCK_CLASS, bx, |
96 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 96 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
97 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 97 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
98 | efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), | 98 | efl_ui_clock_edit_mode_set(efl_added, EINA_TRUE), |
99 | efl_ui_clock_pause_set(efl_added, EINA_TRUE), | 99 | efl_ui_clock_pause_set(efl_added, EINA_TRUE), |
100 | efl_pack(bx, efl_added)); | 100 | efl_pack(bx, efl_added)); |
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index f864a430c4..e8d602f8d5 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c | |||
@@ -80,7 +80,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
80 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, | 80 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, |
81 | efl_file_set(efl_added, buf, "page"), | 81 | efl_file_set(efl_added, buf, "page"), |
82 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); | 82 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); |
83 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 83 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
84 | break; | 84 | break; |
85 | case LIST: | 85 | case LIST: |
86 | page = elm_list_add(parent); | 86 | page = elm_list_add(parent); |
@@ -98,7 +98,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
98 | case BUTTON: | 98 | case BUTTON: |
99 | page = efl_add(EFL_UI_BUTTON_CLASS, parent, | 99 | page = efl_add(EFL_UI_BUTTON_CLASS, parent, |
100 | efl_text_set(efl_added, "Button Page")); | 100 | efl_text_set(efl_added, "Button Page")); |
101 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 101 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
102 | break; | 102 | break; |
103 | default: | 103 | default: |
104 | snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", | 104 | snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", |
@@ -106,7 +106,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
106 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, | 106 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, |
107 | efl_file_set(efl_added, buf, "page"), | 107 | efl_file_set(efl_added, buf, "page"), |
108 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); | 108 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); |
109 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 109 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
110 | break; | 110 | break; |
111 | } | 111 | } |
112 | 112 | ||
@@ -339,8 +339,8 @@ static void page_size_cb(void *data, | |||
339 | // Width | 339 | // Width |
340 | fr = elm_frame_add(box); | 340 | fr = elm_frame_add(box); |
341 | elm_object_text_set(fr, "Width"); | 341 | elm_object_text_set(fr, "Width"); |
342 | efl_gfx_size_hint_align_set(fr, -1, -1); | 342 | efl_gfx_hint_align_set(fr, -1, -1); |
343 | efl_gfx_size_hint_weight_set(fr, 1, 1); | 343 | efl_gfx_hint_weight_set(fr, 1, 1); |
344 | efl_pack(box, fr); | 344 | efl_pack(box, fr); |
345 | efl_gfx_entity_visible_set(fr, 1); | 345 | efl_gfx_entity_visible_set(fr, 1); |
346 | 346 | ||
@@ -355,7 +355,7 @@ static void page_size_cb(void *data, | |||
355 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, | 355 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, |
356 | efl_ui_range_min_max_set(efl_added, 100, 200), | 356 | efl_ui_range_min_max_set(efl_added, 100, 200), |
357 | efl_ui_range_value_set(efl_added, params->w), | 357 | efl_ui_range_value_set(efl_added, params->w), |
358 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), | 358 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), |
359 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 359 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
360 | width_slider_cb, params), | 360 | width_slider_cb, params), |
361 | efl_pack_end(inbox, efl_added)); | 361 | efl_pack_end(inbox, efl_added)); |
@@ -380,8 +380,8 @@ static void page_size_cb(void *data, | |||
380 | // Height | 380 | // Height |
381 | fr = elm_frame_add(box); | 381 | fr = elm_frame_add(box); |
382 | elm_object_text_set(fr, "Height"); | 382 | elm_object_text_set(fr, "Height"); |
383 | efl_gfx_size_hint_align_set(fr, -1, -1); | 383 | efl_gfx_hint_align_set(fr, -1, -1); |
384 | efl_gfx_size_hint_weight_set(fr, 1, 1); | 384 | efl_gfx_hint_weight_set(fr, 1, 1); |
385 | efl_pack(box, fr); | 385 | efl_pack(box, fr); |
386 | efl_gfx_entity_visible_set(fr, 1); | 386 | efl_gfx_entity_visible_set(fr, 1); |
387 | 387 | ||
@@ -396,7 +396,7 @@ static void page_size_cb(void *data, | |||
396 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, | 396 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, |
397 | efl_ui_range_min_max_set(efl_added, 100, 300), | 397 | efl_ui_range_min_max_set(efl_added, 100, 300), |
398 | efl_ui_range_value_set(efl_added, params->h), | 398 | efl_ui_range_value_set(efl_added, params->h), |
399 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), | 399 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), |
400 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 400 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
401 | height_slider_cb, params), | 401 | height_slider_cb, params), |
402 | efl_pack_end(inbox, efl_added)); | 402 | efl_pack_end(inbox, efl_added)); |
@@ -610,7 +610,7 @@ static void current_page_cb(void *data, | |||
610 | efl_pack_end(box, efl_added)); | 610 | efl_pack_end(box, efl_added)); |
611 | 611 | ||
612 | sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, | 612 | sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, |
613 | efl_gfx_size_hint_align_set(efl_added, -1, -1), | 613 | efl_gfx_hint_align_set(efl_added, -1, -1), |
614 | efl_pack_end(box, efl_added)); | 614 | efl_pack_end(box, efl_added)); |
615 | 615 | ||
616 | if (efl_content_count(pager) > 0) | 616 | if (efl_content_count(pager) > 0) |
@@ -679,7 +679,7 @@ void test_ui_pager(void *data EINA_UNUSED, | |||
679 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 679 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
680 | 680 | ||
681 | panes = efl_add(EFL_UI_PANES_CLASS, win, | 681 | panes = efl_add(EFL_UI_PANES_CLASS, win, |
682 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 682 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
683 | efl_ui_panes_split_ratio_set(efl_added, 0.3), | 683 | efl_ui_panes_split_ratio_set(efl_added, 0.3), |
684 | efl_content_set(win, efl_added)); | 684 | efl_content_set(win, efl_added)); |
685 | 685 | ||
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c index 99a6fc9146..9941304491 100644 --- a/src/bin/elementary/test_ui_pager_scroll.c +++ b/src/bin/elementary/test_ui_pager_scroll.c | |||
@@ -85,7 +85,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
85 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, | 85 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, |
86 | efl_file_set(efl_added, buf, "page"), | 86 | efl_file_set(efl_added, buf, "page"), |
87 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); | 87 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); |
88 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 88 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
89 | break; | 89 | break; |
90 | case LIST: | 90 | case LIST: |
91 | page = elm_list_add(parent); | 91 | page = elm_list_add(parent); |
@@ -103,7 +103,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
103 | case BUTTON: | 103 | case BUTTON: |
104 | page = efl_add(EFL_UI_BUTTON_CLASS, parent, | 104 | page = efl_add(EFL_UI_BUTTON_CLASS, parent, |
105 | efl_text_set(efl_added, "Button Page")); | 105 | efl_text_set(efl_added, "Button Page")); |
106 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 106 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
107 | break; | 107 | break; |
108 | default: | 108 | default: |
109 | snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", | 109 | snprintf(buf, sizeof(buf), "%s/objects/test_pager.edj", |
@@ -111,7 +111,7 @@ static Eo *page_add(Page_Type p, Eo *parent) | |||
111 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, | 111 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, |
112 | efl_file_set(efl_added, buf, "page"), | 112 | efl_file_set(efl_added, buf, "page"), |
113 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); | 113 | efl_text_set(efl_part(efl_added, "text"), "Layout Page")); |
114 | efl_gfx_size_hint_fill_set(page, EINA_TRUE, EINA_TRUE); | 114 | efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE); |
115 | break; | 115 | break; |
116 | } | 116 | } |
117 | 117 | ||
@@ -395,8 +395,8 @@ static void page_size_cb(void *data, | |||
395 | // Width | 395 | // Width |
396 | fr = elm_frame_add(box); | 396 | fr = elm_frame_add(box); |
397 | elm_object_text_set(fr, "Width"); | 397 | elm_object_text_set(fr, "Width"); |
398 | efl_gfx_size_hint_align_set(fr, -1, -1); | 398 | efl_gfx_hint_align_set(fr, -1, -1); |
399 | efl_gfx_size_hint_weight_set(fr, 1, 1); | 399 | efl_gfx_hint_weight_set(fr, 1, 1); |
400 | efl_pack(box, fr); | 400 | efl_pack(box, fr); |
401 | efl_gfx_entity_visible_set(fr, 1); | 401 | efl_gfx_entity_visible_set(fr, 1); |
402 | 402 | ||
@@ -411,7 +411,7 @@ static void page_size_cb(void *data, | |||
411 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, | 411 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, |
412 | efl_ui_range_min_max_set(efl_added, 100, 200), | 412 | efl_ui_range_min_max_set(efl_added, 100, 200), |
413 | efl_ui_range_value_set(efl_added, params->w), | 413 | efl_ui_range_value_set(efl_added, params->w), |
414 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), | 414 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), |
415 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 415 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
416 | width_slider_cb, params), | 416 | width_slider_cb, params), |
417 | efl_pack_end(inbox, efl_added)); | 417 | efl_pack_end(inbox, efl_added)); |
@@ -436,8 +436,8 @@ static void page_size_cb(void *data, | |||
436 | // Height | 436 | // Height |
437 | fr = elm_frame_add(box); | 437 | fr = elm_frame_add(box); |
438 | elm_object_text_set(fr, "Height"); | 438 | elm_object_text_set(fr, "Height"); |
439 | efl_gfx_size_hint_align_set(fr, -1, -1); | 439 | efl_gfx_hint_align_set(fr, -1, -1); |
440 | efl_gfx_size_hint_weight_set(fr, 1, 1); | 440 | efl_gfx_hint_weight_set(fr, 1, 1); |
441 | efl_pack(box, fr); | 441 | efl_pack(box, fr); |
442 | efl_gfx_entity_visible_set(fr, 1); | 442 | efl_gfx_entity_visible_set(fr, 1); |
443 | 443 | ||
@@ -452,7 +452,7 @@ static void page_size_cb(void *data, | |||
452 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, | 452 | sl = efl_add(EFL_UI_SLIDER_CLASS, inbox, |
453 | efl_ui_range_min_max_set(efl_added, 100, 300), | 453 | efl_ui_range_min_max_set(efl_added, 100, 300), |
454 | efl_ui_range_value_set(efl_added, params->h), | 454 | efl_ui_range_value_set(efl_added, params->h), |
455 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), | 455 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), |
456 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 456 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
457 | height_slider_cb, params), | 457 | height_slider_cb, params), |
458 | efl_pack_end(inbox, efl_added)); | 458 | efl_pack_end(inbox, efl_added)); |
@@ -496,7 +496,7 @@ static void padding_cb(void *data, | |||
496 | efl_add(EFL_UI_SLIDER_CLASS, box, | 496 | efl_add(EFL_UI_SLIDER_CLASS, box, |
497 | efl_ui_range_min_max_set(efl_added, 0, 50), | 497 | efl_ui_range_min_max_set(efl_added, 0, 50), |
498 | efl_ui_range_value_set(efl_added, params->padding), | 498 | efl_ui_range_value_set(efl_added, params->padding), |
499 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(100, 0)), | 499 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(100, 0)), |
500 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 500 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
501 | padding_slider_cb, params), | 501 | padding_slider_cb, params), |
502 | efl_pack_end(box, efl_added)); | 502 | efl_pack_end(box, efl_added)); |
@@ -526,8 +526,8 @@ static void side_page_num_cb(void *data, | |||
526 | efl_ui_range_min_max_set(efl_added, 0, 3), | 526 | efl_ui_range_min_max_set(efl_added, 0, 3), |
527 | efl_ui_range_value_set(efl_added, params->side_page_num), | 527 | efl_ui_range_value_set(efl_added, params->side_page_num), |
528 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), | 528 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), |
529 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 529 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
530 | efl_gfx_size_hint_align_set(efl_added, -1, -1), | 530 | efl_gfx_hint_align_set(efl_added, -1, -1), |
531 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, | 531 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, |
532 | side_page_num_slider_cb, params), | 532 | side_page_num_slider_cb, params), |
533 | efl_pack_end(box, efl_added)); | 533 | efl_pack_end(box, efl_added)); |
@@ -724,7 +724,7 @@ static void current_page_cb(void *data, | |||
724 | efl_pack_end(box, efl_added)); | 724 | efl_pack_end(box, efl_added)); |
725 | 725 | ||
726 | sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, | 726 | sp = efl_add(EFL_UI_SPIN_BUTTON_CLASS, box, |
727 | efl_gfx_size_hint_align_set(efl_added, -1, -1), | 727 | efl_gfx_hint_align_set(efl_added, -1, -1), |
728 | efl_pack_end(box, efl_added)); | 728 | efl_pack_end(box, efl_added)); |
729 | 729 | ||
730 | if (efl_content_count(pager) > 0) | 730 | if (efl_content_count(pager) > 0) |
@@ -860,7 +860,7 @@ void test_ui_pager_scroll(void *data EINA_UNUSED, | |||
860 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 860 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
861 | 861 | ||
862 | panes = efl_add(EFL_UI_PANES_CLASS, win, | 862 | panes = efl_add(EFL_UI_PANES_CLASS, win, |
863 | efl_gfx_size_hint_weight_set(efl_added, 1, 1), | 863 | efl_gfx_hint_weight_set(efl_added, 1, 1), |
864 | efl_ui_panes_split_ratio_set(efl_added, 0.3), | 864 | efl_ui_panes_split_ratio_set(efl_added, 0.3), |
865 | efl_content_set(win, efl_added)); | 865 | efl_content_set(win, efl_added)); |
866 | 866 | ||
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c index eed8d14759..40ca680c0f 100644 --- a/src/bin/elementary/test_ui_panel.c +++ b/src/bin/elementary/test_ui_panel.c | |||
@@ -20,8 +20,8 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
20 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); | 20 | snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get()); |
21 | efl_add(EFL_UI_IMAGE_CLASS, table, | 21 | efl_add(EFL_UI_IMAGE_CLASS, table, |
22 | efl_file_set(efl_added, buf, NULL), | 22 | efl_file_set(efl_added, buf, NULL), |
23 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 23 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
24 | efl_gfx_size_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), | 24 | efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL), |
25 | efl_pack_table(table, efl_added, 0, 0, 4, 5)); | 25 | efl_pack_table(table, efl_added, 0, 0, 4, 5)); |
26 | 26 | ||
27 | // Top Panel | 27 | // Top Panel |
@@ -114,17 +114,17 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
114 | efl_ui_check_selected_set(efl_added, elm_config_scroll_thumbscroll_enabled_get()), | 114 | efl_ui_check_selected_set(efl_added, elm_config_scroll_thumbscroll_enabled_get()), |
115 | efl_text_set(efl_added, "Enable thumb scroll (temporarily"), | 115 | efl_text_set(efl_added, "Enable thumb scroll (temporarily"), |
116 | efl_event_callback_add(efl_added, EFL_UI_NSTATE_EVENT_CHANGED, _check_changed, NULL), | 116 | efl_event_callback_add(efl_added, EFL_UI_NSTATE_EVENT_CHANGED, _check_changed, NULL), |
117 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), | 117 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), |
118 | efl_pack(box, efl_added)); | 118 | efl_pack(box, efl_added)); |
119 | 119 | ||
120 | check = efl_add(EFL_UI_CHECK_CLASS, box, | 120 | check = efl_add(EFL_UI_CHECK_CLASS, box, |
121 | efl_text_set(efl_added, "Reset content on toggle"), | 121 | efl_text_set(efl_added, "Reset content on toggle"), |
122 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), | 122 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), |
123 | efl_pack(box, efl_added)); | 123 | efl_pack(box, efl_added)); |
124 | 124 | ||
125 | btn = efl_add(EFL_UI_BUTTON_CLASS, box, | 125 | btn = efl_add(EFL_UI_BUTTON_CLASS, box, |
126 | efl_text_set(efl_added, "toggle"), | 126 | efl_text_set(efl_added, "toggle"), |
127 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), | 127 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), |
128 | efl_pack(box, efl_added)); | 128 | efl_pack(box, efl_added)); |
129 | 129 | ||
130 | table = efl_add(EFL_UI_TABLE_CLASS, box, | 130 | table = efl_add(EFL_UI_TABLE_CLASS, box, |
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c index 4e6d3373e0..3dcf010929 100644 --- a/src/bin/elementary/test_ui_panes.c +++ b/src/bin/elementary/test_ui_panes.c | |||
@@ -21,7 +21,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
21 | 21 | ||
22 | efl_add(EFL_UI_BUTTON_CLASS, win, | 22 | efl_add(EFL_UI_BUTTON_CLASS, win, |
23 | efl_text_set(efl_added, "Left - user set min size(110,110)"), | 23 | efl_text_set(efl_added, "Left - user set min size(110,110)"), |
24 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(110, 110)), | 24 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(110, 110)), |
25 | efl_content_set(efl_part(panes, "first"), efl_added) | 25 | efl_content_set(efl_part(panes, "first"), efl_added) |
26 | ); | 26 | ); |
27 | 27 | ||
@@ -31,14 +31,14 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
31 | ); | 31 | ); |
32 | efl_add(EFL_UI_BUTTON_CLASS, win, | 32 | efl_add(EFL_UI_BUTTON_CLASS, win, |
33 | efl_text_set(efl_added, "Up - user set min size(10,0)"), | 33 | efl_text_set(efl_added, "Up - user set min size(10,0)"), |
34 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(10, 0)), | 34 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(10, 0)), |
35 | efl_content_set(efl_part(panes_h, "first"), efl_added) | 35 | efl_content_set(efl_part(panes_h, "first"), efl_added) |
36 | ); | 36 | ); |
37 | efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); | 37 | efl_ui_panes_part_hint_min_allow_set(efl_part(panes_h, "first"), EINA_TRUE); |
38 | 38 | ||
39 | efl_add(EFL_UI_BUTTON_CLASS, win, | 39 | efl_add(EFL_UI_BUTTON_CLASS, win, |
40 | efl_text_set(efl_added, "Down - min size 50 40"), | 40 | efl_text_set(efl_added, "Down - min size 50 40"), |
41 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(50, 40)), | 41 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(50, 40)), |
42 | efl_content_set(efl_part(panes_h, "second"), efl_added) | 42 | efl_content_set(efl_part(panes_h, "second"), efl_added) |
43 | ); | 43 | ); |
44 | 44 | ||
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c index 3f59a4a28f..311ec1d715 100644 --- a/src/bin/elementary/test_ui_popup.c +++ b/src/bin/elementary/test_ui_popup.c | |||
@@ -1009,7 +1009,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
1009 | Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); | 1009 | Eo *layout = efl_add(EFL_UI_LAYOUT_CLASS, win); |
1010 | snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); | 1010 | snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get()); |
1011 | efl_file_set(layout, buf, "efl_ui_anchor_popup_layout"); | 1011 | efl_file_set(layout, buf, "efl_ui_anchor_popup_layout"); |
1012 | efl_gfx_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1012 | efl_gfx_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1013 | efl_content_set(win, layout); | 1013 | efl_content_set(win, layout); |
1014 | 1014 | ||
1015 | Eo *efl_ui_popup = efl_add(EFL_UI_ANCHOR_POPUP_CLASS, win); | 1015 | Eo *efl_ui_popup = efl_add(EFL_UI_ANCHOR_POPUP_CLASS, win); |
@@ -1034,7 +1034,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
1034 | { | 1034 | { |
1035 | btn = efl_add(EFL_UI_BUTTON_CLASS, win); | 1035 | btn = efl_add(EFL_UI_BUTTON_CLASS, win); |
1036 | efl_text_set(btn, "anchor"); | 1036 | efl_text_set(btn, "anchor"); |
1037 | efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1037 | efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1038 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); | 1038 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup); |
1039 | 1039 | ||
1040 | snprintf(buf, sizeof(buf), "anchor%d", i+1); | 1040 | snprintf(buf, sizeof(buf), "anchor%d", i+1); |
@@ -1043,52 +1043,52 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
1043 | 1043 | ||
1044 | btn = efl_add(EFL_UI_BUTTON_CLASS, win); | 1044 | btn = efl_add(EFL_UI_BUTTON_CLASS, win); |
1045 | efl_text_set(btn, "anchor none"); | 1045 | efl_text_set(btn, "anchor none"); |
1046 | efl_gfx_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1046 | efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1047 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); | 1047 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup); |
1048 | efl_content_set(efl_part(layout, "anchor_none"), btn); | 1048 | efl_content_set(efl_part(layout, "anchor_none"), btn); |
1049 | 1049 | ||
1050 | Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); | 1050 | Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); |
1051 | efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 1051 | efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
1052 | 1052 | ||
1053 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1053 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1054 | efl_text_set(btn, "Center Align"); | 1054 | efl_text_set(btn, "Center Align"); |
1055 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); | 1055 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); |
1056 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); | 1056 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data); |
1057 | efl_pack_table(table, btn, 0, 0, 2, 1); | 1057 | efl_pack_table(table, btn, 0, 0, 2, 1); |
1058 | 1058 | ||
1059 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1059 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1060 | efl_text_set(btn, "Top Align"); | 1060 | efl_text_set(btn, "Top Align"); |
1061 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); | 1061 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); |
1062 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); | 1062 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data); |
1063 | efl_pack_table(table, btn, 2, 0, 2, 1); | 1063 | efl_pack_table(table, btn, 2, 0, 2, 1); |
1064 | 1064 | ||
1065 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1065 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1066 | efl_text_set(btn, "Bottom Align"); | 1066 | efl_text_set(btn, "Bottom Align"); |
1067 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(70, 35)); | 1067 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); |
1068 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); | 1068 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data); |
1069 | efl_pack_table(table, btn, 4, 0, 2, 1); | 1069 | efl_pack_table(table, btn, 4, 0, 2, 1); |
1070 | 1070 | ||
1071 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1071 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1072 | efl_text_set(btn, "Left Align"); | 1072 | efl_text_set(btn, "Left Align"); |
1073 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); | 1073 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); |
1074 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); | 1074 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data); |
1075 | efl_pack_table(table, btn, 0, 1, 3, 1); | 1075 | efl_pack_table(table, btn, 0, 1, 3, 1); |
1076 | 1076 | ||
1077 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1077 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1078 | efl_text_set(btn, "Right Align"); | 1078 | efl_text_set(btn, "Right Align"); |
1079 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); | 1079 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); |
1080 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); | 1080 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data); |
1081 | efl_pack_table(table, btn, 3, 1, 3, 1); | 1081 | efl_pack_table(table, btn, 3, 1, 3, 1); |
1082 | 1082 | ||
1083 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1083 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1084 | efl_text_set(btn, "Position Set"); | 1084 | efl_text_set(btn, "Position Set"); |
1085 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); | 1085 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); |
1086 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); | 1086 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data); |
1087 | efl_pack_table(table, btn, 0, 2, 3, 1); | 1087 | efl_pack_table(table, btn, 0, 2, 3, 1); |
1088 | 1088 | ||
1089 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); | 1089 | btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); |
1090 | efl_text_set(btn, "Resize"); | 1090 | efl_text_set(btn, "Resize"); |
1091 | efl_gfx_size_hint_min_set(btn, EINA_SIZE2D(100, 35)); | 1091 | efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); |
1092 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); | 1092 | efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data); |
1093 | efl_pack_table(table, btn, 3, 2, 3, 1); | 1093 | efl_pack_table(table, btn, 3, 2, 3, 1); |
1094 | 1094 | ||
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c index 09a0e704c0..cbb2fdc95a 100644 --- a/src/bin/elementary/test_ui_progressbar.c +++ b/src/bin/elementary/test_ui_progressbar.c | |||
@@ -133,7 +133,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf | |||
133 | efl_pack(bx, efl_added), | 133 | efl_pack(bx, efl_added), |
134 | efl_text_set(efl_added, "percent"), | 134 | efl_text_set(efl_added, "percent"), |
135 | efl_ui_range_min_max_set(efl_added, 0, 100), | 135 | efl_ui_range_min_max_set(efl_added, 0, 100), |
136 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)) | 136 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)) |
137 | ); | 137 | ); |
138 | 138 | ||
139 | snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); | 139 | snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); |
@@ -146,7 +146,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf | |||
146 | efl_pack(bx, efl_added), | 146 | efl_pack(bx, efl_added), |
147 | efl_text_set(efl_added, "10-100"), | 147 | efl_text_set(efl_added, "10-100"), |
148 | efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE), | 148 | efl_ui_progressbar_pulse_set(efl_added, EINA_TRUE), |
149 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(250, 20)), | 149 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(250, 20)), |
150 | efl_ui_range_min_max_set(efl_added, 10, 100), | 150 | efl_ui_range_min_max_set(efl_added, 10, 100), |
151 | efl_ui_range_value_set(efl_added, 10) | 151 | efl_ui_range_value_set(efl_added, 10) |
152 | ); | 152 | ); |
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c index 2cbceb77f3..3a43a43902 100644 --- a/src/bin/elementary/test_ui_scroller.c +++ b/src/bin/elementary/test_ui_scroller.c | |||
@@ -37,28 +37,28 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
37 | efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); | 37 | efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); |
38 | 38 | ||
39 | sc = efl_add(EFL_UI_SCROLLER_CLASS, win, | 39 | sc = efl_add(EFL_UI_SCROLLER_CLASS, win, |
40 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 40 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
41 | efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), | 41 | efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_START, _scroll_start_cb, NULL), |
42 | efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), | 42 | efl_event_callback_add(efl_added, EFL_UI_EVENT_SCROLL_STOP, _scroll_stop_cb, NULL), |
43 | efl_content_set(win, efl_added)); | 43 | efl_content_set(win, efl_added)); |
44 | 44 | ||
45 | bx = efl_add(EFL_UI_BOX_CLASS, sc, | 45 | bx = efl_add(EFL_UI_BOX_CLASS, sc, |
46 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), | 46 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN), |
47 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), | 47 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0), |
48 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0), | 48 | efl_gfx_hint_align_set(efl_added, 0.5, 0), |
49 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 49 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
50 | efl_content_set(sc, efl_added)); | 50 | efl_content_set(sc, efl_added)); |
51 | 51 | ||
52 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 52 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
53 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), | 53 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), |
54 | efl_pack(bx, efl_added)); | 54 | efl_pack(bx, efl_added)); |
55 | 55 | ||
56 | for (i = 0; i < 3; i++) | 56 | for (i = 0; i < 3; i++) |
57 | { | 57 | { |
58 | efl_add(EFL_UI_BUTTON_CLASS, bx, | 58 | efl_add(EFL_UI_BUTTON_CLASS, bx, |
59 | efl_text_set(efl_added, "Vertical"), | 59 | efl_text_set(efl_added, "Vertical"), |
60 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), | 60 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), |
61 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 61 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
62 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), | 62 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), |
63 | efl_pack(bx, efl_added)); | 63 | efl_pack(bx, efl_added)); |
64 | } | 64 | } |
@@ -83,25 +83,25 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
83 | { | 83 | { |
84 | efl_add(EFL_UI_BUTTON_CLASS, bx, | 84 | efl_add(EFL_UI_BUTTON_CLASS, bx, |
85 | efl_text_set(efl_added, "Vertical"), | 85 | efl_text_set(efl_added, "Vertical"), |
86 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), | 86 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), |
87 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 87 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
88 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), | 88 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), |
89 | efl_pack(bx, efl_added)); | 89 | efl_pack(bx, efl_added)); |
90 | } | 90 | } |
91 | 91 | ||
92 | gd = efl_add(EFL_UI_TABLE_CLASS, bx, | 92 | gd = efl_add(EFL_UI_TABLE_CLASS, bx, |
93 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 93 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
94 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0), | 94 | efl_gfx_hint_align_set(efl_added, 0.5, 0), |
95 | efl_pack(bx, efl_added)); | 95 | efl_pack(bx, efl_added)); |
96 | 96 | ||
97 | efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, | 97 | efl_add(EFL_CANVAS_RECTANGLE_CLASS, win, |
98 | efl_gfx_color_set(efl_added, 0, 0, 0, 0), | 98 | efl_gfx_color_set(efl_added, 0, 0, 0, 0), |
99 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(200, 120)), | 99 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(200, 120)), |
100 | efl_pack_table(gd, efl_added, 0, 0, 1, 1)); | 100 | efl_pack_table(gd, efl_added, 0, 0, 1, 1)); |
101 | 101 | ||
102 | sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, | 102 | sc3 = efl_add(EFL_UI_SCROLLER_CLASS, win, |
103 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 103 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
104 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 104 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
105 | efl_pack_table(gd, efl_added, 0, 0, 1, 1)); | 105 | efl_pack_table(gd, efl_added, 0, 0, 1, 1)); |
106 | 106 | ||
107 | gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3, | 107 | gd2 = efl_add(EFL_UI_TABLE_CLASS, sc3, |
@@ -122,8 +122,8 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
122 | { | 122 | { |
123 | efl_add(EFL_UI_BUTTON_CLASS, bx, | 123 | efl_add(EFL_UI_BUTTON_CLASS, bx, |
124 | efl_text_set(efl_added, "Vertical"), | 124 | efl_text_set(efl_added, "Vertical"), |
125 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), | 125 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), |
126 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), | 126 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), |
127 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), | 127 | efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL), |
128 | efl_pack(bx, efl_added)); | 128 | efl_pack(bx, efl_added)); |
129 | } | 129 | } |
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c index 9f54a9d365..66bfe0f2f8 100644 --- a/src/bin/elementary/test_ui_slider.c +++ b/src/bin/elementary/test_ui_slider.c | |||
@@ -46,8 +46,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
46 | efl_pack(bx, efl_added)); | 46 | efl_pack(bx, efl_added)); |
47 | 47 | ||
48 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 48 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
49 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), | 49 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), |
50 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), | 50 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), |
51 | efl_pack(bx, efl_added)); | 51 | efl_pack(bx, efl_added)); |
52 | 52 | ||
53 | efl_add(EFL_UI_TEXT_CLASS, bx, | 53 | efl_add(EFL_UI_TEXT_CLASS, bx, |
@@ -56,8 +56,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
56 | efl_pack(bx, efl_added)); | 56 | efl_pack(bx, efl_added)); |
57 | 57 | ||
58 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 58 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
59 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), | 59 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), |
60 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), | 60 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), |
61 | efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT), | 61 | efl_ui_direction_set(efl_added, EFL_UI_DIR_LEFT), |
62 | efl_pack(bx, efl_added)); | 62 | efl_pack(bx, efl_added)); |
63 | 63 | ||
@@ -68,8 +68,8 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
68 | 68 | ||
69 | step = _step_size_calculate(0, 9); | 69 | step = _step_size_calculate(0, 9); |
70 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 70 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
71 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), | 71 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), |
72 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), | 72 | efl_gfx_hint_align_set(efl_added, 0.5, 0.5), |
73 | efl_ui_range_step_set(efl_added, step), | 73 | efl_ui_range_step_set(efl_added, step), |
74 | efl_pack(bx, efl_added)); | 74 | efl_pack(bx, efl_added)); |
75 | 75 | ||
@@ -79,7 +79,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
79 | efl_pack(bx, efl_added)); | 79 | efl_pack(bx, efl_added)); |
80 | 80 | ||
81 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 81 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
82 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), | 82 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), |
83 | efl_ui_range_min_max_set(efl_added, 10, 145), | 83 | efl_ui_range_min_max_set(efl_added, 10, 145), |
84 | efl_ui_range_step_set(efl_added, step), | 84 | efl_ui_range_step_set(efl_added, step), |
85 | elm_object_disabled_set(efl_added, EINA_TRUE), | 85 | elm_object_disabled_set(efl_added, EINA_TRUE), |
@@ -95,7 +95,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
95 | efl_pack(bx, efl_added)); | 95 | efl_pack(bx, efl_added)); |
96 | 96 | ||
97 | efl_add(EFL_UI_SLIDER_CLASS, hbx, | 97 | efl_add(EFL_UI_SLIDER_CLASS, hbx, |
98 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), | 98 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), |
99 | efl_ui_range_min_max_set(efl_added, 10, 145), | 99 | efl_ui_range_min_max_set(efl_added, 10, 145), |
100 | efl_ui_range_step_set(efl_added, step), | 100 | efl_ui_range_step_set(efl_added, step), |
101 | efl_ui_range_value_set(efl_added, 70), | 101 | efl_ui_range_value_set(efl_added, 70), |
@@ -103,7 +103,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
103 | efl_pack(hbx, efl_added)); | 103 | efl_pack(hbx, efl_added)); |
104 | 104 | ||
105 | efl_add(EFL_UI_SLIDER_CLASS, hbx, | 105 | efl_add(EFL_UI_SLIDER_CLASS, hbx, |
106 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), | 106 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), |
107 | efl_ui_range_min_max_set(efl_added, 10, 145), | 107 | efl_ui_range_min_max_set(efl_added, 10, 145), |
108 | efl_ui_range_step_set(efl_added, step), | 108 | efl_ui_range_step_set(efl_added, step), |
109 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), | 109 | efl_ui_direction_set(efl_added, EFL_UI_DIR_VERTICAL), |
@@ -111,7 +111,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
111 | efl_pack(hbx, efl_added)); | 111 | efl_pack(hbx, efl_added)); |
112 | 112 | ||
113 | efl_add(EFL_UI_SLIDER_CLASS, hbx, | 113 | efl_add(EFL_UI_SLIDER_CLASS, hbx, |
114 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), | 114 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), |
115 | efl_ui_range_min_max_set(efl_added, 10, 145), | 115 | efl_ui_range_min_max_set(efl_added, 10, 145), |
116 | efl_ui_range_value_set(efl_added, 35), | 116 | efl_ui_range_value_set(efl_added, 35), |
117 | efl_ui_range_step_set(efl_added, step), | 117 | efl_ui_range_step_set(efl_added, step), |
@@ -124,7 +124,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event | |||
124 | efl_pack(bx, efl_added)); | 124 | efl_pack(bx, efl_added)); |
125 | 125 | ||
126 | efl_add(EFL_UI_SLIDER_CLASS, bx, | 126 | efl_add(EFL_UI_SLIDER_CLASS, bx, |
127 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), | 127 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), |
128 | efl_ui_range_min_max_set(efl_added, 0, 150), | 128 | efl_ui_range_min_max_set(efl_added, 0, 150), |
129 | efl_ui_range_step_set(efl_added, step), | 129 | efl_ui_range_step_set(efl_added, step), |
130 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), | 130 | efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_CHANGED, _slider_changed_cb, NULL), |
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c index 3973b3d846..09589a7689 100644 --- a/src/bin/elementary/test_ui_slider_interval.c +++ b/src/bin/elementary/test_ui_slider_interval.c | |||
@@ -46,7 +46,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
46 | efl_pack(bx, efl_added)); | 46 | efl_pack(bx, efl_added)); |
47 | 47 | ||
48 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, | 48 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, |
49 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)), | 49 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(160, 0)), |
50 | efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), | 50 | efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), |
51 | efl_pack(bx, efl_added)); | 51 | efl_pack(bx, efl_added)); |
52 | 52 | ||
@@ -57,7 +57,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
57 | 57 | ||
58 | step = _step_size_calculate(0, 9); | 58 | step = _step_size_calculate(0, 9); |
59 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, | 59 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, |
60 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), | 60 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), |
61 | efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), | 61 | efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9), |
62 | efl_ui_range_step_set(efl_added, step), | 62 | efl_ui_range_step_set(efl_added, step), |
63 | efl_pack(bx, efl_added)); | 63 | efl_pack(bx, efl_added)); |
@@ -68,7 +68,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
68 | efl_pack(bx, efl_added)); | 68 | efl_pack(bx, efl_added)); |
69 | 69 | ||
70 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, | 70 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, |
71 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(120, 0)), | 71 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(120, 0)), |
72 | efl_ui_range_min_max_set(efl_added, 10, 145), | 72 | efl_ui_range_min_max_set(efl_added, 10, 145), |
73 | efl_ui_slider_interval_value_set(efl_added, 50, 100), | 73 | efl_ui_slider_interval_value_set(efl_added, 50, 100), |
74 | efl_ui_range_step_set(efl_added, step), | 74 | efl_ui_range_step_set(efl_added, step), |
@@ -85,7 +85,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
85 | efl_pack(bx, efl_added)); | 85 | efl_pack(bx, efl_added)); |
86 | 86 | ||
87 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, | 87 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, |
88 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), | 88 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), |
89 | efl_ui_range_min_max_set(efl_added, 10, 145), | 89 | efl_ui_range_min_max_set(efl_added, 10, 145), |
90 | efl_ui_slider_interval_value_set(efl_added, 50, 100), | 90 | efl_ui_slider_interval_value_set(efl_added, 50, 100), |
91 | efl_ui_range_step_set(efl_added, step), | 91 | efl_ui_range_step_set(efl_added, step), |
@@ -93,7 +93,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
93 | efl_pack(hbx, efl_added)); | 93 | efl_pack(hbx, efl_added)); |
94 | 94 | ||
95 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, | 95 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx, |
96 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)), | 96 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(0, 160)), |
97 | efl_ui_range_min_max_set(efl_added, 10, 145), | 97 | efl_ui_range_min_max_set(efl_added, 10, 145), |
98 | efl_ui_slider_interval_value_set(efl_added, 50, 100), | 98 | efl_ui_slider_interval_value_set(efl_added, 50, 100), |
99 | efl_ui_range_step_set(efl_added, step), | 99 | efl_ui_range_step_set(efl_added, step), |
@@ -107,7 +107,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void | |||
107 | efl_pack(bx, efl_added)); | 107 | efl_pack(bx, efl_added)); |
108 | 108 | ||
109 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, | 109 | efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx, |
110 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)), | 110 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(260, 0)), |
111 | efl_ui_range_min_max_set(efl_added, 0, 600), | 111 | efl_ui_range_min_max_set(efl_added, 0, 600), |
112 | efl_ui_slider_interval_value_set(efl_added, 100, 500), | 112 | efl_ui_slider_interval_value_set(efl_added, 100, 500), |
113 | efl_ui_range_step_set(efl_added, step), | 113 | efl_ui_range_step_set(efl_added, step), |
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c index 84bef407af..318e019e42 100644 --- a/src/bin/elementary/test_ui_tab_pager.c +++ b/src/bin/elementary/test_ui_tab_pager.c | |||
@@ -88,8 +88,8 @@ content_add(Eo *parent, char *text) | |||
88 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, | 88 | page = efl_add(EFL_UI_LAYOUT_CLASS, parent, |
89 | efl_file_set(efl_added, buf, "page_layout"), | 89 | efl_file_set(efl_added, buf, "page_layout"), |
90 | efl_text_set(efl_part(efl_added, "text"), text), | 90 | efl_text_set(efl_part(efl_added, "text"), text), |
91 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 91 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
92 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE)); | 92 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE)); |
93 | 93 | ||
94 | return page; | 94 | return page; |
95 | } | 95 | } |
@@ -133,20 +133,20 @@ test_ui_tab_pager(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev | |||
133 | efl_content_set(win, efl_added)); | 133 | efl_content_set(win, efl_added)); |
134 | 134 | ||
135 | navi = elm_naviframe_add(layout); | 135 | navi = elm_naviframe_add(layout); |
136 | efl_gfx_size_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 136 | efl_gfx_hint_weight_set(navi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
137 | efl_gfx_size_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL); | 137 | efl_gfx_hint_align_set(navi, EVAS_HINT_FILL, EVAS_HINT_FILL); |
138 | efl_content_set(efl_part(layout, "menu"), navi); | 138 | efl_content_set(efl_part(layout, "menu"), navi); |
139 | 139 | ||
140 | list = elm_list_add(navi); | 140 | list = elm_list_add(navi); |
141 | efl_gfx_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 141 | efl_gfx_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
142 | efl_gfx_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); | 142 | efl_gfx_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); |
143 | elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS); | 143 | elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_ALWAYS); |
144 | elm_naviframe_item_push(navi, "Properties", NULL, NULL, list, NULL); | 144 | elm_naviframe_item_push(navi, "Properties", NULL, NULL, list, NULL); |
145 | efl_gfx_entity_visible_set(list, EINA_TRUE); | 145 | efl_gfx_entity_visible_set(list, EINA_TRUE); |
146 | 146 | ||
147 | tp = efl_add(EFL_UI_TAB_PAGER_CLASS, layout, | 147 | tp = efl_add(EFL_UI_TAB_PAGER_CLASS, layout, |
148 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 148 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
149 | efl_gfx_size_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), | 149 | efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_TRUE), |
150 | efl_ui_pager_page_size_set(efl_added, EINA_SIZE2D(-1, -1)), | 150 | efl_ui_pager_page_size_set(efl_added, EINA_SIZE2D(-1, -1)), |
151 | efl_ui_pager_padding_set(efl_added, 20), | 151 | efl_ui_pager_padding_set(efl_added, 20), |
152 | efl_content_set(efl_part(layout, "tab_pager"), efl_added)); | 152 | efl_content_set(efl_part(layout, "tab_pager"), efl_added)); |
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c index 9f1a20ef11..098fe139b7 100644 --- a/src/bin/elementary/test_ui_table.c +++ b/src/bin/elementary/test_ui_table.c | |||
@@ -33,32 +33,32 @@ weights_cb(void *data, const Efl_Event *event) | |||
33 | switch (mode) | 33 | switch (mode) |
34 | { | 34 | { |
35 | case NONE: | 35 | case NONE: |
36 | efl_gfx_size_hint_align_set(table, 0.5, 0.5); | 36 | efl_gfx_hint_align_set(table, 0.5, 0.5); |
37 | for (int i = 0; i < 7; i++) | 37 | for (int i = 0; i < 7; i++) |
38 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 38 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
39 | break; | 39 | break; |
40 | case NONE_BUT_FILL: | 40 | case NONE_BUT_FILL: |
41 | efl_gfx_size_hint_fill_set(table, EINA_TRUE, EINA_TRUE); | 41 | efl_gfx_hint_fill_set(table, EINA_TRUE, EINA_TRUE); |
42 | for (int i = 0; i < 7; i++) | 42 | for (int i = 0; i < 7; i++) |
43 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 43 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
44 | break; | 44 | break; |
45 | case EQUAL: | 45 | case EQUAL: |
46 | efl_gfx_size_hint_align_set(table, 0.5, 0.5); | 46 | efl_gfx_hint_align_set(table, 0.5, 0.5); |
47 | for (int i = 0; i < 7; i++) | 47 | for (int i = 0; i < 7; i++) |
48 | efl_gfx_size_hint_weight_set(objects[i], 1, 1); | 48 | efl_gfx_hint_weight_set(objects[i], 1, 1); |
49 | break; | 49 | break; |
50 | case ONE: | 50 | case ONE: |
51 | efl_gfx_size_hint_align_set(table, 0.5, 0.5); | 51 | efl_gfx_hint_align_set(table, 0.5, 0.5); |
52 | for (int i = 0; i < 6; i++) | 52 | for (int i = 0; i < 6; i++) |
53 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 53 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
54 | efl_gfx_size_hint_weight_set(objects[6], 1, 1); | 54 | efl_gfx_hint_weight_set(objects[6], 1, 1); |
55 | break; | 55 | break; |
56 | case TWO: | 56 | case TWO: |
57 | efl_gfx_size_hint_align_set(table, 0.5, 0.5); | 57 | efl_gfx_hint_align_set(table, 0.5, 0.5); |
58 | for (int i = 0; i < 5; i++) | 58 | for (int i = 0; i < 5; i++) |
59 | efl_gfx_size_hint_weight_set(objects[i], 0, 0); | 59 | efl_gfx_hint_weight_set(objects[i], 0, 0); |
60 | efl_gfx_size_hint_weight_set(objects[5], 1, 1); | 60 | efl_gfx_hint_weight_set(objects[5], 1, 1); |
61 | efl_gfx_size_hint_weight_set(objects[6], 1, 1); | 61 | efl_gfx_hint_weight_set(objects[6], 1, 1); |
62 | break; | 62 | break; |
63 | case CUSTOM: | 63 | case CUSTOM: |
64 | efl_object_override(table, &custom_layout_ops); | 64 | efl_object_override(table, &custom_layout_ops); |
@@ -71,7 +71,7 @@ user_min_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) | |||
71 | { | 71 | { |
72 | int val = elm_slider_value_get(event->object); | 72 | int val = elm_slider_value_get(event->object); |
73 | for (int i = 0; i < 6; i++) | 73 | for (int i = 0; i < 6; i++) |
74 | efl_gfx_size_hint_min_set(objects[i], EINA_SIZE2D(val, val)); | 74 | efl_gfx_hint_size_min_set(objects[i], EINA_SIZE2D(val, val)); |
75 | } | 75 | } |
76 | 76 | ||
77 | static void | 77 | static void |
@@ -85,7 +85,7 @@ static void | |||
85 | margin_slider_cb(void *data, const Efl_Event *event) | 85 | margin_slider_cb(void *data, const Efl_Event *event) |
86 | { | 86 | { |
87 | int val = elm_slider_value_get(event->object); | 87 | int val = elm_slider_value_get(event->object); |
88 | efl_gfx_size_hint_margin_set(data, val, val, val, val); | 88 | efl_gfx_hint_margin_set(data, val, val, val, val); |
89 | } | 89 | } |
90 | 90 | ||
91 | static void | 91 | static void |
@@ -93,7 +93,7 @@ btnmargins_slider_cb(void *data, const Efl_Event *event) | |||
93 | { | 93 | { |
94 | int val = elm_slider_value_get(event->object); | 94 | int val = elm_slider_value_get(event->object); |
95 | for (int i = 1; i < 7; i++) | 95 | for (int i = 1; i < 7; i++) |
96 | efl_gfx_size_hint_margin_set(data, val, val, val, val); | 96 | efl_gfx_hint_margin_set(data, val, val, val, val); |
97 | } | 97 | } |
98 | 98 | ||
99 | static void | 99 | static void |
@@ -102,8 +102,8 @@ alignv_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) | |||
102 | double ax, val; | 102 | double ax, val; |
103 | 103 | ||
104 | val = elm_slider_value_get(event->object); | 104 | val = elm_slider_value_get(event->object); |
105 | efl_gfx_size_hint_align_get(objects[1], &ax, NULL); | 105 | efl_gfx_hint_align_get(objects[1], &ax, NULL); |
106 | efl_gfx_size_hint_align_set(objects[1], ax, val); | 106 | efl_gfx_hint_align_set(objects[1], ax, val); |
107 | } | 107 | } |
108 | 108 | ||
109 | static void | 109 | static void |
@@ -112,8 +112,8 @@ alignh_slider_cb(void *data EINA_UNUSED, const Efl_Event *event) | |||
112 | double ay, val; | 112 | double ay, val; |
113 | 113 | ||
114 | val = elm_slider_value_get(event->object); | 114 | val = elm_slider_value_get(event->object); |
115 | efl_gfx_size_hint_align_get(objects[1], NULL, &ay); | 115 | efl_gfx_hint_align_get(objects[1], NULL, &ay); |
116 | efl_gfx_size_hint_align_set(objects[1], val, ay); | 116 | efl_gfx_hint_align_set(objects[1], val, ay); |
117 | } | 117 | } |
118 | 118 | ||
119 | static void | 119 | static void |
@@ -173,7 +173,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED) | |||
173 | 173 | ||
174 | m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2; | 174 | m.x = g.x + c * g.w / cols + (cs * g.w / cols - g.x) / 2; |
175 | m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2; | 175 | m.y = g.y + r * g.h / rows + (rs * g.h / rows - g.y) / 2; |
176 | m.size = efl_gfx_size_hint_combined_min_get(item); | 176 | m.size = efl_gfx_hint_size_combined_min_get(item); |
177 | efl_gfx_entity_geometry_set(item, m); | 177 | efl_gfx_entity_geometry_set(item, m); |
178 | 178 | ||
179 | gmw = MAX(gmw, m.w); | 179 | gmw = MAX(gmw, m.w); |
@@ -183,7 +183,7 @@ _custom_layout_update(Eo *pack, void *_pd EINA_UNUSED) | |||
183 | eina_iterator_free(it); | 183 | eina_iterator_free(it); |
184 | 184 | ||
185 | end: | 185 | end: |
186 | efl_gfx_size_hint_min_set(pack, EINA_SIZE2D(gmw * cols, gmh * rows)); | 186 | efl_gfx_hint_size_min_set(pack, EINA_SIZE2D(gmw * cols, gmh * rows)); |
187 | } | 187 | } |
188 | 188 | ||
189 | void | 189 | void |
@@ -199,8 +199,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
199 | vbox = efl_add(EFL_UI_BOX_CLASS, win, | 199 | vbox = efl_add(EFL_UI_BOX_CLASS, win, |
200 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 200 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
201 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); | 201 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); |
202 | efl_gfx_size_hint_weight_set(vbox, 1, 1); | 202 | efl_gfx_hint_weight_set(vbox, 1, 1); |
203 | efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); | 203 | efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); |
204 | elm_win_resize_object_add(win, vbox); | 204 | elm_win_resize_object_add(win, vbox); |
205 | 205 | ||
206 | 206 | ||
@@ -211,8 +211,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
211 | /* controls */ | 211 | /* controls */ |
212 | f = elm_frame_add(win); | 212 | f = elm_frame_add(win); |
213 | elm_object_text_set(f, "Controls"); | 213 | elm_object_text_set(f, "Controls"); |
214 | efl_gfx_size_hint_align_set(f, -1, -1); | 214 | efl_gfx_hint_align_set(f, -1, -1); |
215 | efl_gfx_size_hint_weight_set(f, 1, 0); | 215 | efl_gfx_hint_weight_set(f, 1, 0); |
216 | efl_pack(vbox, f); | 216 | efl_pack(vbox, f); |
217 | efl_gfx_entity_visible_set(f, 1); | 217 | efl_gfx_entity_visible_set(f, 1); |
218 | 218 | ||
@@ -225,14 +225,14 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
225 | /* weights radio group */ | 225 | /* weights radio group */ |
226 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 226 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
227 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 227 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
228 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 228 | efl_gfx_hint_align_set(bx, 0, 0.5); |
229 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 229 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
230 | efl_pack(hbox, bx); | 230 | efl_pack(hbox, bx); |
231 | 231 | ||
232 | chk = o = elm_radio_add(win); | 232 | chk = o = elm_radio_add(win); |
233 | elm_object_text_set(o, "No weight"); | 233 | elm_object_text_set(o, "No weight"); |
234 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 234 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
235 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 235 | efl_gfx_hint_align_set(o, 0, 0.5); |
236 | elm_radio_state_value_set(o, NONE); | 236 | elm_radio_state_value_set(o, NONE); |
237 | efl_pack(bx, o); | 237 | efl_pack(bx, o); |
238 | efl_gfx_entity_visible_set(o, 1); | 238 | efl_gfx_entity_visible_set(o, 1); |
@@ -240,7 +240,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
240 | o = elm_radio_add(win); | 240 | o = elm_radio_add(win); |
241 | elm_object_text_set(o, "No weight + table fill"); | 241 | elm_object_text_set(o, "No weight + table fill"); |
242 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 242 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
243 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 243 | efl_gfx_hint_align_set(o, 0, 0.5); |
244 | elm_radio_state_value_set(o, NONE_BUT_FILL); | 244 | elm_radio_state_value_set(o, NONE_BUT_FILL); |
245 | elm_radio_group_add(o, chk); | 245 | elm_radio_group_add(o, chk); |
246 | efl_pack(bx, o); | 246 | efl_pack(bx, o); |
@@ -249,7 +249,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
249 | o = elm_radio_add(win); | 249 | o = elm_radio_add(win); |
250 | elm_object_text_set(o, "Equal weights"); | 250 | elm_object_text_set(o, "Equal weights"); |
251 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 251 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
252 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 252 | efl_gfx_hint_align_set(o, 0, 0.5); |
253 | elm_radio_state_value_set(o, EQUAL); | 253 | elm_radio_state_value_set(o, EQUAL); |
254 | elm_radio_group_add(o, chk); | 254 | elm_radio_group_add(o, chk); |
255 | efl_pack(bx, o); | 255 | efl_pack(bx, o); |
@@ -258,7 +258,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
258 | o = elm_radio_add(win); | 258 | o = elm_radio_add(win); |
259 | elm_object_text_set(o, "One weight only"); | 259 | elm_object_text_set(o, "One weight only"); |
260 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 260 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
261 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 261 | efl_gfx_hint_align_set(o, 0, 0.5); |
262 | elm_radio_state_value_set(o, ONE); | 262 | elm_radio_state_value_set(o, ONE); |
263 | elm_radio_group_add(o, chk); | 263 | elm_radio_group_add(o, chk); |
264 | efl_pack(bx, o); | 264 | efl_pack(bx, o); |
@@ -267,7 +267,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
267 | o = elm_radio_add(win); | 267 | o = elm_radio_add(win); |
268 | elm_object_text_set(o, "Two weights"); | 268 | elm_object_text_set(o, "Two weights"); |
269 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 269 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
270 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 270 | efl_gfx_hint_align_set(o, 0, 0.5); |
271 | elm_radio_state_value_set(o, TWO); | 271 | elm_radio_state_value_set(o, TWO); |
272 | elm_radio_group_add(o, chk); | 272 | elm_radio_group_add(o, chk); |
273 | efl_pack(bx, o); | 273 | efl_pack(bx, o); |
@@ -276,7 +276,7 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
276 | o = elm_radio_add(win); | 276 | o = elm_radio_add(win); |
277 | elm_object_text_set(o, "Custom layout"); | 277 | elm_object_text_set(o, "Custom layout"); |
278 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); | 278 | efl_event_callback_add(o, EFL_UI_RADIO_EVENT_CHANGED, weights_cb, table); |
279 | efl_gfx_size_hint_align_set(o, 0, 0.5); | 279 | efl_gfx_hint_align_set(o, 0, 0.5); |
280 | elm_radio_state_value_set(o, CUSTOM); | 280 | elm_radio_state_value_set(o, CUSTOM); |
281 | elm_radio_group_add(o, chk); | 281 | elm_radio_group_add(o, chk); |
282 | efl_pack(bx, o); | 282 | efl_pack(bx, o); |
@@ -288,8 +288,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
288 | /* min size setter */ | 288 | /* min size setter */ |
289 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 289 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
290 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 290 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
291 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 291 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
292 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 292 | efl_gfx_hint_weight_set(bx, 0, 1); |
293 | efl_pack(hbox, bx); | 293 | efl_pack(hbox, bx); |
294 | 294 | ||
295 | o = elm_label_add(win); | 295 | o = elm_label_add(win); |
@@ -301,8 +301,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
301 | elm_slider_indicator_format_set(o, "%.0fpx"); | 301 | elm_slider_indicator_format_set(o, "%.0fpx"); |
302 | elm_slider_indicator_show_set(o, 1); | 302 | elm_slider_indicator_show_set(o, 1); |
303 | elm_slider_horizontal_set(o, 0); | 303 | elm_slider_horizontal_set(o, 0); |
304 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 304 | efl_gfx_hint_align_set(o, 0.5, -1); |
305 | efl_gfx_size_hint_weight_set(o, 1, 1); | 305 | efl_gfx_hint_weight_set(o, 1, 1); |
306 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); | 306 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, user_min_slider_cb, NULL); |
307 | elm_slider_min_max_set(o, 0, 250); | 307 | elm_slider_min_max_set(o, 0, 250); |
308 | elm_slider_inverted_set(o, 1); | 308 | elm_slider_inverted_set(o, 1); |
@@ -314,9 +314,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
314 | /* inner box padding */ | 314 | /* inner box padding */ |
315 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 315 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
316 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 316 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
317 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 317 | efl_gfx_hint_align_set(bx, 0, 0.5); |
318 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 318 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
319 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 319 | efl_gfx_hint_weight_set(bx, 0, 1); |
320 | efl_pack(hbox, bx); | 320 | efl_pack(hbox, bx); |
321 | 321 | ||
322 | o = elm_label_add(win); | 322 | o = elm_label_add(win); |
@@ -328,8 +328,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
328 | elm_slider_indicator_format_set(o, "%.0fpx"); | 328 | elm_slider_indicator_format_set(o, "%.0fpx"); |
329 | elm_slider_indicator_show_set(o, 1); | 329 | elm_slider_indicator_show_set(o, 1); |
330 | elm_slider_horizontal_set(o, 0); | 330 | elm_slider_horizontal_set(o, 0); |
331 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 331 | efl_gfx_hint_align_set(o, 0.5, -1); |
332 | efl_gfx_size_hint_weight_set(o, 1, 1); | 332 | efl_gfx_hint_weight_set(o, 1, 1); |
333 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, table); | 333 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, padding_slider_cb, table); |
334 | elm_slider_min_max_set(o, 0, 40); | 334 | elm_slider_min_max_set(o, 0, 40); |
335 | elm_slider_inverted_set(o, 1); | 335 | elm_slider_inverted_set(o, 1); |
@@ -341,8 +341,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
341 | /* outer margin */ | 341 | /* outer margin */ |
342 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 342 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
343 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 343 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
344 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 344 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
345 | efl_gfx_size_hint_weight_set(bx, 0, 1); | 345 | efl_gfx_hint_weight_set(bx, 0, 1); |
346 | efl_pack(hbox, bx); | 346 | efl_pack(hbox, bx); |
347 | 347 | ||
348 | o = elm_label_add(win); | 348 | o = elm_label_add(win); |
@@ -354,8 +354,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
354 | elm_slider_indicator_format_set(o, "%.0fpx"); | 354 | elm_slider_indicator_format_set(o, "%.0fpx"); |
355 | elm_slider_indicator_show_set(o, 1); | 355 | elm_slider_indicator_show_set(o, 1); |
356 | elm_slider_horizontal_set(o, 0); | 356 | elm_slider_horizontal_set(o, 0); |
357 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 357 | efl_gfx_hint_align_set(o, 0.5, -1); |
358 | efl_gfx_size_hint_weight_set(o, 1, 1); | 358 | efl_gfx_hint_weight_set(o, 1, 1); |
359 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, table); | 359 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, margin_slider_cb, table); |
360 | elm_slider_min_max_set(o, 0, 40); | 360 | elm_slider_min_max_set(o, 0, 40); |
361 | elm_slider_inverted_set(o, 1); | 361 | elm_slider_inverted_set(o, 1); |
@@ -367,9 +367,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
367 | /* button margins */ | 367 | /* button margins */ |
368 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 368 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
369 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 369 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
370 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 370 | efl_gfx_hint_align_set(bx, 0, 0.5); |
371 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 371 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
372 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 372 | efl_gfx_hint_weight_set(bx, 1, 1); |
373 | efl_pack(hbox, bx); | 373 | efl_pack(hbox, bx); |
374 | 374 | ||
375 | o = elm_label_add(win); | 375 | o = elm_label_add(win); |
@@ -381,8 +381,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
381 | elm_slider_indicator_format_set(o, "%.0fpx"); | 381 | elm_slider_indicator_format_set(o, "%.0fpx"); |
382 | elm_slider_indicator_show_set(o, 1); | 382 | elm_slider_indicator_show_set(o, 1); |
383 | elm_slider_horizontal_set(o, 0); | 383 | elm_slider_horizontal_set(o, 0); |
384 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 384 | efl_gfx_hint_align_set(o, 0.5, -1); |
385 | efl_gfx_size_hint_weight_set(o, 1, 1); | 385 | efl_gfx_hint_weight_set(o, 1, 1); |
386 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, table); | 386 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, btnmargins_slider_cb, table); |
387 | elm_slider_min_max_set(o, 0, 40); | 387 | elm_slider_min_max_set(o, 0, 40); |
388 | elm_slider_inverted_set(o, 1); | 388 | elm_slider_inverted_set(o, 1); |
@@ -394,9 +394,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
394 | /* button1 aligns */ | 394 | /* button1 aligns */ |
395 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 395 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
396 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 396 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
397 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 397 | efl_gfx_hint_align_set(bx, 0, 0.5); |
398 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 398 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
399 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 399 | efl_gfx_hint_weight_set(bx, 1, 1); |
400 | efl_pack(hbox, bx); | 400 | efl_pack(hbox, bx); |
401 | 401 | ||
402 | o = elm_label_add(win); | 402 | o = elm_label_add(win); |
@@ -408,8 +408,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
408 | elm_slider_indicator_format_set(o, "%.1f"); | 408 | elm_slider_indicator_format_set(o, "%.1f"); |
409 | elm_slider_indicator_show_set(o, 1); | 409 | elm_slider_indicator_show_set(o, 1); |
410 | elm_slider_horizontal_set(o, 0); | 410 | elm_slider_horizontal_set(o, 0); |
411 | efl_gfx_size_hint_align_set(o, 0.5, -1); | 411 | efl_gfx_hint_align_set(o, 0.5, -1); |
412 | efl_gfx_size_hint_weight_set(o, 1, 1); | 412 | efl_gfx_hint_weight_set(o, 1, 1); |
413 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, NULL); | 413 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignv_slider_cb, NULL); |
414 | elm_slider_min_max_set(o, 0, 1); | 414 | elm_slider_min_max_set(o, 0, 1); |
415 | elm_slider_value_set(o, 0.3); | 415 | elm_slider_value_set(o, 0.3); |
@@ -420,8 +420,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
420 | elm_slider_indicator_format_set(o, "%.1f"); | 420 | elm_slider_indicator_format_set(o, "%.1f"); |
421 | elm_slider_indicator_show_set(o, 1); | 421 | elm_slider_indicator_show_set(o, 1); |
422 | elm_slider_horizontal_set(o, 1); | 422 | elm_slider_horizontal_set(o, 1); |
423 | efl_gfx_size_hint_align_set(o, -1, -1); | 423 | efl_gfx_hint_align_set(o, -1, -1); |
424 | efl_gfx_size_hint_weight_set(o, 1, 0); | 424 | efl_gfx_hint_weight_set(o, 1, 0); |
425 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, NULL); | 425 | efl_event_callback_add(o, EFL_UI_SLIDER_EVENT_CHANGED, alignh_slider_cb, NULL); |
426 | elm_slider_min_max_set(o, 0, 1); | 426 | elm_slider_min_max_set(o, 0, 1); |
427 | elm_slider_value_set(o, 0.3); | 427 | elm_slider_value_set(o, 0.3); |
@@ -431,9 +431,9 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
431 | /* ro info */ | 431 | /* ro info */ |
432 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 432 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
433 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 433 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
434 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 434 | efl_gfx_hint_align_set(bx, 0, 0.5); |
435 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 435 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
436 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 436 | efl_gfx_hint_weight_set(bx, 1, 1); |
437 | efl_pack(hbox, bx); | 437 | efl_pack(hbox, bx); |
438 | 438 | ||
439 | o = elm_label_add(win); | 439 | o = elm_label_add(win); |
@@ -449,8 +449,8 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
449 | o = elm_label_add(win); | 449 | o = elm_label_add(win); |
450 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); | 450 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); |
451 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); | 451 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); |
452 | efl_gfx_size_hint_align_set(o, 0.5, 0); | 452 | efl_gfx_hint_align_set(o, 0.5, 0); |
453 | efl_gfx_size_hint_weight_set(o, 1, 1); | 453 | efl_gfx_hint_weight_set(o, 1, 1); |
454 | efl_pack(bx, o); | 454 | efl_pack(bx, o); |
455 | efl_gfx_entity_visible_set(o, 1); | 455 | efl_gfx_entity_visible_set(o, 1); |
456 | 456 | ||
@@ -458,61 +458,61 @@ test_ui_table(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ | |||
458 | /* contents */ | 458 | /* contents */ |
459 | f = elm_frame_add(win); | 459 | f = elm_frame_add(win); |
460 | elm_object_text_set(f, "Contents"); | 460 | elm_object_text_set(f, "Contents"); |
461 | efl_gfx_size_hint_align_set(f, -1, -1); | 461 | efl_gfx_hint_align_set(f, -1, -1); |
462 | efl_gfx_size_hint_weight_set(f, 1, 1); | 462 | efl_gfx_hint_weight_set(f, 1, 1); |
463 | efl_pack(vbox, f); | 463 | efl_pack(vbox, f); |
464 | efl_gfx_entity_visible_set(f, 1); | 464 | efl_gfx_entity_visible_set(f, 1); |
465 | 465 | ||
466 | efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 466 | efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
467 | elm_object_content_set(f, table); | 467 | elm_object_content_set(f, table); |
468 | efl_gfx_entity_visible_set(table, 1); | 468 | efl_gfx_entity_visible_set(table, 1); |
469 | 469 | ||
470 | objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); | 470 | objects[i++] = o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); |
471 | efl_gfx_size_hint_min_set(o, EINA_SIZE2D(10, 10)); | 471 | efl_gfx_hint_size_min_set(o, EINA_SIZE2D(10, 10)); |
472 | efl_gfx_color_set(o, 64, 96, 128, 255); | 472 | efl_gfx_color_set(o, 64, 96, 128, 255); |
473 | efl_pack_table(table, o, 0, 0, 3, 1); | 473 | efl_pack_table(table, o, 0, 0, 3, 1); |
474 | 474 | ||
475 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 475 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
476 | efl_text_set(o, "Button 1"); | 476 | efl_text_set(o, "Button 1"); |
477 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 477 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
478 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 478 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
479 | efl_gfx_size_hint_align_set(o, 0.3, 0.3); | 479 | efl_gfx_hint_align_set(o, 0.3, 0.3); |
480 | efl_gfx_size_hint_max_set(o, EINA_SIZE2D(100, 100)); | 480 | efl_gfx_hint_size_max_set(o, EINA_SIZE2D(100, 100)); |
481 | efl_pack_table(table, o, 0, 0, 1, 1); | 481 | efl_pack_table(table, o, 0, 0, 1, 1); |
482 | efl_gfx_entity_visible_set(o, 1); | 482 | efl_gfx_entity_visible_set(o, 1); |
483 | 483 | ||
484 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 484 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
485 | efl_text_set(o, "Button 2"); | 485 | efl_text_set(o, "Button 2"); |
486 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 486 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
487 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 487 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
488 | efl_pack_table(table, o, 1, 0, 1, 1); | 488 | efl_pack_table(table, o, 1, 0, 1, 1); |
489 | efl_gfx_entity_visible_set(o, 1); | 489 | efl_gfx_entity_visible_set(o, 1); |
490 | 490 | ||
491 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 491 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
492 | efl_text_set(o, "Button 3"); | 492 | efl_text_set(o, "Button 3"); |
493 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 493 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
494 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 494 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
495 | efl_pack_table(table, o, 2, 0, 1, 1); | 495 | efl_pack_table(table, o, 2, 0, 1, 1); |
496 | efl_gfx_entity_visible_set(o, 1); | 496 | efl_gfx_entity_visible_set(o, 1); |
497 | 497 | ||
498 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 498 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
499 | efl_text_set(o, "Button 4"); | 499 | efl_text_set(o, "Button 4"); |
500 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 500 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
501 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 501 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
502 | efl_pack_table(table, o, 0, 1, 2, 1); | 502 | efl_pack_table(table, o, 0, 1, 2, 1); |
503 | efl_gfx_entity_visible_set(o, 1); | 503 | efl_gfx_entity_visible_set(o, 1); |
504 | 504 | ||
505 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 505 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
506 | efl_text_set(o, "Button 5"); | 506 | efl_text_set(o, "Button 5"); |
507 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 507 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
508 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 508 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
509 | efl_pack_table(table, o, 2, 1, 1, 2); | 509 | efl_pack_table(table, o, 2, 1, 1, 2); |
510 | efl_gfx_entity_visible_set(o, 1); | 510 | efl_gfx_entity_visible_set(o, 1); |
511 | 511 | ||
512 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); | 512 | objects[i++] = o = efl_add(EFL_UI_BUTTON_CLASS, table); |
513 | efl_text_set(o, "Button 6"); | 513 | efl_text_set(o, "Button 6"); |
514 | efl_gfx_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 514 | efl_gfx_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
515 | efl_gfx_size_hint_fill_set(o, EINA_TRUE, EINA_TRUE); | 515 | efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE); |
516 | efl_pack_table(table, o, 0, 2, 2, 1); | 516 | efl_pack_table(table, o, 0, 2, 2, 1); |
517 | efl_gfx_entity_visible_set(o, 1); | 517 | efl_gfx_entity_visible_set(o, 1); |
518 | 518 | ||
@@ -540,8 +540,8 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED) | |||
540 | Eo *table = data; | 540 | Eo *table = data; |
541 | Eo *o = efl_add(EFL_UI_BUTTON_CLASS, table); | 541 | Eo *o = efl_add(EFL_UI_BUTTON_CLASS, table); |
542 | efl_text_set(o, btn_text("appended")); | 542 | efl_text_set(o, btn_text("appended")); |
543 | efl_gfx_size_hint_weight_set(o, 0, 0); | 543 | efl_gfx_hint_weight_set(o, 0, 0); |
544 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 544 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
545 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); | 545 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); |
546 | elm_object_tooltip_text_set(o, "Click to unpack"); | 546 | elm_object_tooltip_text_set(o, "Click to unpack"); |
547 | efl_pack_end(table, o); | 547 | efl_pack_end(table, o); |
@@ -568,7 +568,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
568 | vbox = efl_add(EFL_UI_BOX_CLASS, win, | 568 | vbox = efl_add(EFL_UI_BOX_CLASS, win, |
569 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 569 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
570 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); | 570 | efl_pack_padding_set(vbox, 10, 10, EINA_TRUE); |
571 | efl_gfx_size_hint_margin_set(vbox, 5, 5, 5, 5); | 571 | efl_gfx_hint_margin_set(vbox, 5, 5, 5, 5); |
572 | elm_win_resize_object_add(win, vbox); | 572 | elm_win_resize_object_add(win, vbox); |
573 | efl_gfx_entity_visible_set(vbox, 1); | 573 | efl_gfx_entity_visible_set(vbox, 1); |
574 | 574 | ||
@@ -580,8 +580,8 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
580 | /* controls */ | 580 | /* controls */ |
581 | f = elm_frame_add(win); | 581 | f = elm_frame_add(win); |
582 | elm_object_text_set(f, "Controls"); | 582 | elm_object_text_set(f, "Controls"); |
583 | efl_gfx_size_hint_align_set(f, -1, -1); | 583 | efl_gfx_hint_align_set(f, -1, -1); |
584 | efl_gfx_size_hint_weight_set(f, 1, 0); | 584 | efl_gfx_hint_weight_set(f, 1, 0); |
585 | efl_pack(vbox, f); | 585 | efl_pack(vbox, f); |
586 | efl_gfx_entity_visible_set(f, 1); | 586 | efl_gfx_entity_visible_set(f, 1); |
587 | 587 | ||
@@ -613,9 +613,9 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
613 | /* ro info */ | 613 | /* ro info */ |
614 | bx = efl_add(EFL_UI_BOX_CLASS, win, | 614 | bx = efl_add(EFL_UI_BOX_CLASS, win, |
615 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); | 615 | efl_ui_direction_set(efl_added, EFL_UI_DIR_DOWN)); |
616 | efl_gfx_size_hint_align_set(bx, 0, 0.5); | 616 | efl_gfx_hint_align_set(bx, 0, 0.5); |
617 | efl_gfx_size_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); | 617 | efl_gfx_hint_fill_set(bx, EINA_FALSE, EINA_TRUE); |
618 | efl_gfx_size_hint_weight_set(bx, 1, 1); | 618 | efl_gfx_hint_weight_set(bx, 1, 1); |
619 | efl_pack(hbox, bx); | 619 | efl_pack(hbox, bx); |
620 | efl_gfx_entity_visible_set(bx, 1); | 620 | efl_gfx_entity_visible_set(bx, 1); |
621 | 621 | ||
@@ -632,8 +632,8 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
632 | o = elm_label_add(win); | 632 | o = elm_label_add(win); |
633 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); | 633 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_ADDED, child_evt_cb, o); |
634 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); | 634 | efl_event_callback_add(table, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child_evt_cb, o); |
635 | efl_gfx_size_hint_align_set(o, 0.5, 0); | 635 | efl_gfx_hint_align_set(o, 0.5, 0); |
636 | efl_gfx_size_hint_weight_set(o, 1, 1); | 636 | efl_gfx_hint_weight_set(o, 1, 1); |
637 | efl_pack(bx, o); | 637 | efl_pack(bx, o); |
638 | efl_gfx_entity_visible_set(o, 1); | 638 | efl_gfx_entity_visible_set(o, 1); |
639 | 639 | ||
@@ -641,37 +641,37 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, | |||
641 | /* contents */ | 641 | /* contents */ |
642 | f = elm_frame_add(win); | 642 | f = elm_frame_add(win); |
643 | elm_object_text_set(f, "Contents"); | 643 | elm_object_text_set(f, "Contents"); |
644 | efl_gfx_size_hint_align_set(f, -1, -1); | 644 | efl_gfx_hint_align_set(f, -1, -1); |
645 | efl_gfx_size_hint_weight_set(f, 1, 1); | 645 | efl_gfx_hint_weight_set(f, 1, 1); |
646 | efl_pack(vbox, f); | 646 | efl_pack(vbox, f); |
647 | efl_gfx_entity_visible_set(f, 1); | 647 | efl_gfx_entity_visible_set(f, 1); |
648 | 648 | ||
649 | efl_pack_table_columns_set(table, 4); | 649 | efl_pack_table_columns_set(table, 4); |
650 | efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); | 650 | efl_pack_table_direction_set(table, EFL_UI_DIR_RIGHT, EFL_UI_DIR_DOWN); |
651 | efl_gfx_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 651 | efl_gfx_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
652 | elm_object_content_set(f, table); | 652 | elm_object_content_set(f, table); |
653 | efl_gfx_entity_visible_set(table, 1); | 653 | efl_gfx_entity_visible_set(table, 1); |
654 | 654 | ||
655 | o = efl_add(EFL_UI_BUTTON_CLASS, table); | 655 | o = efl_add(EFL_UI_BUTTON_CLASS, table); |
656 | efl_text_set(o, btn_text(NULL)); | 656 | efl_text_set(o, btn_text(NULL)); |
657 | efl_gfx_size_hint_weight_set(o, 0, 0); | 657 | efl_gfx_hint_weight_set(o, 0, 0); |
658 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 658 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
659 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); | 659 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); |
660 | efl_pack(table, o); | 660 | efl_pack(table, o); |
661 | efl_gfx_entity_visible_set(o, 1); | 661 | efl_gfx_entity_visible_set(o, 1); |
662 | 662 | ||
663 | o = efl_add(EFL_UI_BUTTON_CLASS, table); | 663 | o = efl_add(EFL_UI_BUTTON_CLASS, table); |
664 | efl_text_set(o, btn_text(NULL)); | 664 | efl_text_set(o, btn_text(NULL)); |
665 | efl_gfx_size_hint_weight_set(o, 0, 0); | 665 | efl_gfx_hint_weight_set(o, 0, 0); |
666 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 666 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
667 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); | 667 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); |
668 | efl_pack(table, o); | 668 | efl_pack(table, o); |
669 | efl_gfx_entity_visible_set(o, 1); | 669 | efl_gfx_entity_visible_set(o, 1); |
670 | 670 | ||
671 | o = efl_add(EFL_UI_BUTTON_CLASS, table); | 671 | o = efl_add(EFL_UI_BUTTON_CLASS, table); |
672 | efl_text_set(o, btn_text(NULL)); | 672 | efl_text_set(o, btn_text(NULL)); |
673 | efl_gfx_size_hint_weight_set(o, 0, 0); | 673 | efl_gfx_hint_weight_set(o, 0, 0); |
674 | efl_gfx_size_hint_fill_set(o, EINA_FALSE, EINA_FALSE); | 674 | efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); |
675 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); | 675 | efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL); |
676 | efl_pack(table, o); | 676 | efl_pack(table, o); |
677 | efl_gfx_entity_visible_set(o, 1); | 677 | efl_gfx_entity_visible_set(o, 1); |
diff --git a/src/bin/elementary/test_ui_textpath.c b/src/bin/elementary/test_ui_textpath.c index b865775b8d..2f5542a17d 100644 --- a/src/bin/elementary/test_ui_textpath.c +++ b/src/bin/elementary/test_ui_textpath.c | |||
@@ -99,8 +99,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
99 | 99 | ||
100 | box = elm_box_add(win); | 100 | box = elm_box_add(win); |
101 | elm_box_horizontal_set(box, EINA_FALSE); | 101 | elm_box_horizontal_set(box, EINA_FALSE); |
102 | efl_gfx_size_hint_weight_set(box, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 102 | efl_gfx_hint_weight_set(box, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
103 | efl_gfx_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); | 103 | efl_gfx_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); |
104 | efl_gfx_entity_visible_set(box, EINA_TRUE); | 104 | efl_gfx_entity_visible_set(box, EINA_TRUE); |
105 | 105 | ||
106 | txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win); | 106 | txtpath = efl_add(EFL_UI_TEXTPATH_CLASS, win); |
@@ -114,8 +114,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
114 | 114 | ||
115 | hbox = elm_box_add(win); | 115 | hbox = elm_box_add(win); |
116 | elm_box_horizontal_set(hbox, EINA_TRUE); | 116 | elm_box_horizontal_set(hbox, EINA_TRUE); |
117 | efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 117 | efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
118 | efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); | 118 | efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); |
119 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); | 119 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); |
120 | elm_box_pack_end(box, hbox); | 120 | elm_box_pack_end(box, hbox); |
121 | 121 | ||
@@ -141,8 +141,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
141 | 141 | ||
142 | hbox = elm_box_add(win); | 142 | hbox = elm_box_add(win); |
143 | elm_box_horizontal_set(hbox, EINA_TRUE); | 143 | elm_box_horizontal_set(hbox, EINA_TRUE); |
144 | efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 144 | efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
145 | efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); | 145 | efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); |
146 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); | 146 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); |
147 | elm_box_pack_end(box, hbox); | 147 | elm_box_pack_end(box, hbox); |
148 | 148 | ||
@@ -150,9 +150,9 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
150 | elm_object_text_set(sld, "Angle"); | 150 | elm_object_text_set(sld, "Angle"); |
151 | elm_slider_min_max_set(sld, 0, 360); | 151 | elm_slider_min_max_set(sld, 0, 360); |
152 | elm_slider_value_set(sld, 0); | 152 | elm_slider_value_set(sld, 0); |
153 | efl_gfx_size_hint_align_set(sld, 0.5, EVAS_HINT_FILL); | 153 | efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); |
154 | efl_gfx_size_hint_weight_set(sld, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 154 | efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
155 | efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); | 155 | efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); |
156 | efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); | 156 | efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _angle_changed_cb, txtpath); |
157 | elm_box_pack_end(hbox, sld); | 157 | elm_box_pack_end(hbox, sld); |
158 | efl_gfx_entity_visible_set(sld, EINA_TRUE); | 158 | efl_gfx_entity_visible_set(sld, EINA_TRUE); |
@@ -162,9 +162,9 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
162 | elm_object_text_set(sld, "Slice No"); | 162 | elm_object_text_set(sld, "Slice No"); |
163 | elm_slider_min_max_set(sld, 20, 300); | 163 | elm_slider_min_max_set(sld, 20, 300); |
164 | elm_slider_value_set(sld, 99); | 164 | elm_slider_value_set(sld, 99); |
165 | efl_gfx_size_hint_align_set(sld, 0.5, EVAS_HINT_FILL); | 165 | efl_gfx_hint_align_set(sld, 0.5, EVAS_HINT_FILL); |
166 | efl_gfx_size_hint_weight_set(sld, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 166 | efl_gfx_hint_weight_set(sld, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
167 | efl_gfx_size_hint_min_set(sld, EINA_SIZE2D(150, 0)); | 167 | efl_gfx_hint_size_min_set(sld, EINA_SIZE2D(150, 0)); |
168 | efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); | 168 | efl_event_callback_add(sld, EFL_UI_SLIDER_EVENT_CHANGED, _slice_no_changed_cb, txtpath); |
169 | elm_box_pack_end(hbox, sld); | 169 | elm_box_pack_end(hbox, sld); |
170 | efl_gfx_entity_visible_set(sld, EINA_TRUE); | 170 | efl_gfx_entity_visible_set(sld, EINA_TRUE); |
@@ -172,8 +172,8 @@ test_ui_textpath(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve | |||
172 | 172 | ||
173 | hbox = elm_box_add(win); | 173 | hbox = elm_box_add(win); |
174 | elm_box_horizontal_set(hbox, EINA_TRUE); | 174 | elm_box_horizontal_set(hbox, EINA_TRUE); |
175 | efl_gfx_size_hint_weight_set(hbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 175 | efl_gfx_hint_weight_set(hbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
176 | efl_gfx_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); | 176 | efl_gfx_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); |
177 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); | 177 | efl_gfx_entity_visible_set(hbox, EINA_TRUE); |
178 | elm_box_pack_end(box, hbox); | 178 | elm_box_pack_end(box, hbox); |
179 | 179 | ||
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c index 6858cf85a9..b0a061660c 100644 --- a/src/bin/elementary/test_win_dialog.c +++ b/src/bin/elementary/test_win_dialog.c | |||
@@ -36,14 +36,14 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_ | |||
36 | 36 | ||
37 | // Notes: | 37 | // Notes: |
38 | // - All objects have 0 weight, this makes the window not resizable. | 38 | // - All objects have 0 weight, this makes the window not resizable. |
39 | // - With EO APIs, efl_gfx_size_hint_min_set() is safe to call as EFL will | 39 | // - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will |
40 | // only set the restricted min size (and combine them for calculation). | 40 | // only set the restricted min size (and combine them for calculation). |
41 | 41 | ||
42 | lb = efl_add(EFL_UI_TEXT_CLASS, dia, | 42 | lb = efl_add(EFL_UI_TEXT_CLASS, dia, |
43 | efl_text_set(efl_added, "This is a non-resizable dialog."), | 43 | efl_text_set(efl_added, "This is a non-resizable dialog."), |
44 | efl_gfx_size_hint_min_set(efl_added, size), | 44 | efl_gfx_hint_size_min_set(efl_added, size), |
45 | efl_gfx_size_hint_max_set(efl_added, size), | 45 | efl_gfx_hint_size_max_set(efl_added, size), |
46 | efl_gfx_size_hint_weight_set(efl_added, 0, 0)); | 46 | efl_gfx_hint_weight_set(efl_added, 0, 0)); |
47 | 47 | ||
48 | // Swallow in the label as the default content, this will make it visible. | 48 | // Swallow in the label as the default content, this will make it visible. |
49 | efl_content_set(dia, lb); | 49 | efl_content_set(dia, lb); |
@@ -57,9 +57,9 @@ _size_update(void *data, const Efl_Event *ev) | |||
57 | Eo *dia = ev->object; | 57 | Eo *dia = ev->object; |
58 | Eo *lbl = data; | 58 | Eo *lbl = data; |
59 | 59 | ||
60 | cmin = efl_gfx_size_hint_combined_min_get(dia); | 60 | cmin = efl_gfx_hint_size_combined_min_get(dia); |
61 | min = efl_gfx_size_hint_min_get(dia); | 61 | min = efl_gfx_hint_size_min_get(dia); |
62 | max = efl_gfx_size_hint_max_get(dia); | 62 | max = efl_gfx_hint_size_max_get(dia); |
63 | sz = efl_gfx_entity_size_get(dia); | 63 | sz = efl_gfx_entity_size_get(dia); |
64 | 64 | ||
65 | sprintf(buf, "This is a dialog with min/max size<br>" | 65 | sprintf(buf, "This is a dialog with min/max size<br>" |
@@ -86,14 +86,14 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_ | |||
86 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); | 86 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); |
87 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); | 87 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); |
88 | elm_object_text_set(lb, "This is a Dialog Window"); | 88 | elm_object_text_set(lb, "This is a Dialog Window"); |
89 | efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); | 89 | efl_gfx_hint_weight_set(lb, 1.0, 1.0); |
90 | 90 | ||
91 | // Swallow in the label as the default content, this will make it visible. | 91 | // Swallow in the label as the default content, this will make it visible. |
92 | efl_content_set(dia, lb); | 92 | efl_content_set(dia, lb); |
93 | 93 | ||
94 | // Set min & max size (app-side) | 94 | // Set min & max size (app-side) |
95 | efl_gfx_size_hint_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); | 95 | efl_gfx_hint_size_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); |
96 | efl_gfx_size_hint_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); | 96 | efl_gfx_hint_size_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); |
97 | } | 97 | } |
98 | 98 | ||
99 | static void | 99 | static void |
@@ -113,14 +113,14 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even | |||
113 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); | 113 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _size_update, lb); |
114 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); | 114 | efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_RESIZE, _size_update, lb); |
115 | elm_object_text_set(lb, "This is a Centered Dialog Window"); | 115 | elm_object_text_set(lb, "This is a Centered Dialog Window"); |
116 | efl_gfx_size_hint_weight_set(lb, 1.0, 1.0); | 116 | efl_gfx_hint_weight_set(lb, 1.0, 1.0); |
117 | 117 | ||
118 | // Swallow in the label as the default content, this will make it visible. | 118 | // Swallow in the label as the default content, this will make it visible. |
119 | efl_content_set(dia, lb); | 119 | efl_content_set(dia, lb); |
120 | 120 | ||
121 | // Set min & max size (app-side) | 121 | // Set min & max size (app-side) |
122 | efl_gfx_size_hint_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); | 122 | efl_gfx_hint_size_min_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(0), ELM_SCALE_SIZE(100))); |
123 | efl_gfx_size_hint_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); | 123 | efl_gfx_hint_size_max_set(dia, EINA_SIZE2D(ELM_SCALE_SIZE(800), ELM_SCALE_SIZE(600))); |
124 | 124 | ||
125 | efl_ui_win_center(dia, EINA_TRUE, EINA_TRUE); | 125 | efl_ui_win_center(dia, EINA_TRUE, EINA_TRUE); |
126 | } | 126 | } |
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c index 99f54c589e..1b72b0d311 100644 --- a/src/bin/elementary/test_win_indicator.c +++ b/src/bin/elementary/test_win_indicator.c | |||
@@ -38,8 +38,8 @@ _create_indicator(void) | |||
38 | efl_content_set(win, efl_added)); | 38 | efl_content_set(win, efl_added)); |
39 | 39 | ||
40 | efl_add(EFL_UI_CLOCK_CLASS, bx, | 40 | efl_add(EFL_UI_CLOCK_CLASS, bx, |
41 | efl_gfx_size_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 41 | efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
42 | efl_gfx_size_hint_align_set(efl_added, 0.5, 0.5), | 42 | efl_gfx_hint_align_set(efl_added, 0.5, 0.5), |
43 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), | 43 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_HOUR, EINA_FALSE), |
44 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), | 44 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_MINUTE, EINA_FALSE), |
45 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), | 45 | efl_ui_clock_field_visible_set(efl_added, EFL_UI_CLOCK_TYPE_AMPM, EINA_FALSE), |
@@ -94,13 +94,13 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e | |||
94 | win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, | 94 | win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, |
95 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), | 95 | efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC), |
96 | efl_text_set(efl_added, "Efl.Win.Indicator"), | 96 | efl_text_set(efl_added, "Efl.Win.Indicator"), |
97 | efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)), | 97 | efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)), |
98 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); | 98 | efl_ui_win_autodel_set(efl_added, EINA_TRUE)); |
99 | efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator); | 99 | efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, indicator); |
100 | efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360)); | 100 | efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 360)); |
101 | 101 | ||
102 | Eo *bx = efl_add(EFL_UI_BOX_CLASS, win, | 102 | Eo *bx = efl_add(EFL_UI_BOX_CLASS, win, |
103 | efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(300, 0)), | 103 | efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(300, 0)), |
104 | efl_content_set(win, efl_added)); | 104 | efl_content_set(win, efl_added)); |
105 | 105 | ||
106 | efl_add(EFL_UI_BUTTON_CLASS, win, | 106 | efl_add(EFL_UI_BUTTON_CLASS, win, |
diff --git a/src/bin/elementary/test_win_inline.c b/src/bin/elementary/test_win_inline.c index 5209b20014..ea93f0bae6 100644 --- a/src/bin/elementary/test_win_inline.c +++ b/src/bin/elementary/test_win_inline.c | |||
@@ -235,7 +235,7 @@ test_win_inline(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even | |||
235 | elm_win_alpha_set(win2, EINA_TRUE); | 235 | elm_win_alpha_set(win2, EINA_TRUE); |
236 | evas_object_size_hint_weight_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); | 236 | evas_object_size_hint_weight_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); |
237 | evas_object_size_hint_align_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_FILL, EVAS_HINT_FILL); | 237 | evas_object_size_hint_align_set(elm_win_inlined_image_object_get(win2), EVAS_HINT_FILL, EVAS_HINT_FILL); |
238 | efl_gfx_size_hint_margin_set(elm_win_inlined_image_object_get(win2), 20, 20, 20, 20); | 238 | efl_gfx_hint_margin_set(elm_win_inlined_image_object_get(win2), 20, 20, 20, 20); |
239 | efl_pack(box, elm_win_inlined_image_object_get(win2)); | 239 | efl_pack(box, elm_win_inlined_image_object_get(win2)); |
240 | 240 | ||
241 | evas_object_resize(win2, 300, 200); | 241 | evas_object_resize(win2, 300, 200); |
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc index 7f85e19593..8b0364744c 100644 --- a/src/examples/elementary/button_cxx_example_01.cc +++ b/src/examples/elementary/button_cxx_example_01.cc | |||
@@ -27,7 +27,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
27 | 27 | ||
28 | efl::ui::Box box_initial(instantiate, win); | 28 | efl::ui::Box box_initial(instantiate, win); |
29 | box_initial.direction_set(EFL_UI_DIR_HORIZONTAL); | 29 | box_initial.direction_set(EFL_UI_DIR_HORIZONTAL); |
30 | box_initial.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 30 | box_initial.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); |
31 | box.pack_end(box_initial); | 31 | box.pack_end(box_initial); |
32 | 32 | ||
33 | efl::ui::Button btn(instantiate, win); | 33 | efl::ui::Button btn(instantiate, win); |
@@ -78,7 +78,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
78 | 78 | ||
79 | efl::ui::Box box_gap(instantiate, win); | 79 | efl::ui::Box box_gap(instantiate, win); |
80 | box_gap.direction_set(EFL_UI_DIR_HORIZONTAL); | 80 | box_gap.direction_set(EFL_UI_DIR_HORIZONTAL); |
81 | box_gap.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 81 | box_gap.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); |
82 | box.pack_end(box_gap); | 82 | box.pack_end(box_gap); |
83 | 83 | ||
84 | efl::ui::Button btn4(instantiate, win); | 84 | efl::ui::Button btn4(instantiate, win); |
@@ -99,7 +99,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
99 | up.autorepeat_enabled_set(true); | 99 | up.autorepeat_enabled_set(true); |
100 | up.autorepeat_initial_timeout_set(1.0); | 100 | up.autorepeat_initial_timeout_set(1.0); |
101 | up.autorepeat_gap_timeout_set(0.5); | 101 | up.autorepeat_gap_timeout_set(0.5); |
102 | up.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 102 | up.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); |
103 | up.hint_fill_set(true, false); | 103 | up.hint_fill_set(true, false); |
104 | up.hint_align_set(0.5, 0.0); | 104 | up.hint_align_set(0.5, 0.0); |
105 | box.pack_end(up); | 105 | box.pack_end(up); |
@@ -180,7 +180,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
180 | left.autorepeat_enabled_set(true); | 180 | left.autorepeat_enabled_set(true); |
181 | left.autorepeat_initial_timeout_set(1.0); | 181 | left.autorepeat_initial_timeout_set(1.0); |
182 | left.autorepeat_gap_timeout_set(0.5); | 182 | left.autorepeat_gap_timeout_set(0.5); |
183 | left.hint_weight_set(0.0, EFL_GFX_SIZE_HINT_EXPAND); | 183 | left.hint_weight_set(0.0, EFL_GFX_HINT_EXPAND); |
184 | left.hint_fill_set(false, true); | 184 | left.hint_fill_set(false, true); |
185 | left.hint_align_set(0.0, 0.5); | 185 | left.hint_align_set(0.0, 0.5); |
186 | box_inferior.pack_end(left); | 186 | box_inferior.pack_end(left); |
@@ -200,7 +200,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
200 | right.autorepeat_enabled_set(true); | 200 | right.autorepeat_enabled_set(true); |
201 | right.autorepeat_initial_timeout_set(1.0); | 201 | right.autorepeat_initial_timeout_set(1.0); |
202 | right.autorepeat_gap_timeout_set(0.5); | 202 | right.autorepeat_gap_timeout_set(0.5); |
203 | right.hint_weight_set(0.0, EFL_GFX_SIZE_HINT_EXPAND); | 203 | right.hint_weight_set(0.0, EFL_GFX_HINT_EXPAND); |
204 | right.hint_fill_set(false, true); | 204 | right.hint_fill_set(false, true); |
205 | right.hint_align_set(0.0, 0.5); | 205 | right.hint_align_set(0.0, 0.5); |
206 | box_inferior.pack_end(right); | 206 | box_inferior.pack_end(right); |
@@ -214,7 +214,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
214 | down.autorepeat_enabled_set(true); | 214 | down.autorepeat_enabled_set(true); |
215 | down.autorepeat_initial_timeout_set(1.0); | 215 | down.autorepeat_initial_timeout_set(1.0); |
216 | down.autorepeat_gap_timeout_set(0.5); | 216 | down.autorepeat_gap_timeout_set(0.5); |
217 | down.hint_weight_set(EFL_GFX_SIZE_HINT_EXPAND, 0.0); | 217 | down.hint_weight_set(EFL_GFX_HINT_EXPAND, 0.0); |
218 | down.hint_fill_set(true, false); | 218 | down.hint_fill_set(true, false); |
219 | down.hint_align_set(0.5, 0.0); | 219 | down.hint_align_set(0.5, 0.0); |
220 | box.pack_end(down); | 220 | box.pack_end(down); |
diff --git a/src/examples/elementary/efl_ui_grid_example_1.c b/src/examples/elementary/efl_ui_grid_example_1.c index 257f5daf39..b2960bb04b 100644 --- a/src/examples/elementary/efl_ui_grid_example_1.c +++ b/src/examples/elementary/efl_ui_grid_example_1.c | |||
@@ -23,8 +23,8 @@ EoGenerate(const Efl_Class *klass, Eo *parent, Efl_Ui_Dir dir) | |||
23 | { | 23 | { |
24 | Eo* obj = efl_add(klass, parent); | 24 | Eo* obj = efl_add(klass, parent); |
25 | if (dir != EFL_UI_DIR_DEFAULT) efl_ui_direction_set(obj, dir); | 25 | if (dir != EFL_UI_DIR_DEFAULT) efl_ui_direction_set(obj, dir); |
26 | efl_gfx_size_hint_weight_set(obj, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 26 | efl_gfx_hint_weight_set(obj, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
27 | efl_gfx_size_hint_fill_set(obj, EINA_TRUE, EINA_TRUE); | 27 | efl_gfx_hint_fill_set(obj, EINA_TRUE, EINA_TRUE); |
28 | return obj; | 28 | return obj; |
29 | } | 29 | } |
30 | 30 | ||
@@ -47,8 +47,8 @@ elm_main(int argc, char **argv) | |||
47 | elm_win_resize_object_add(win, box); | 47 | elm_win_resize_object_add(win, box); |
48 | 48 | ||
49 | Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, box); | 49 | Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, box); |
50 | efl_gfx_size_hint_weight_set(btn, 0.3, 0.3); | 50 | efl_gfx_hint_weight_set(btn, 0.3, 0.3); |
51 | efl_gfx_size_hint_fill_set(btn, EINA_TRUE, EINA_TRUE); | 51 | efl_gfx_hint_fill_set(btn, EINA_TRUE, EINA_TRUE); |
52 | efl_text_set(btn, "BUTTON"); | 52 | efl_text_set(btn, "BUTTON"); |
53 | efl_pack_end(box, btn); | 53 | efl_pack_end(box, btn); |
54 | 54 | ||
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c index c2bb8946dc..b52cc0e9ed 100644 --- a/src/examples/elementary/efl_ui_list_example_1.c +++ b/src/examples/elementary/efl_ui_list_example_1.c | |||
@@ -115,15 +115,15 @@ elm_main(int argc, char **argv) | |||
115 | 115 | ||
116 | wbox = efl_add(EFL_UI_BOX_CLASS, win); | 116 | wbox = efl_add(EFL_UI_BOX_CLASS, win); |
117 | efl_ui_direction_set(wbox, EFL_UI_DIR_VERTICAL); | 117 | efl_ui_direction_set(wbox, EFL_UI_DIR_VERTICAL); |
118 | efl_gfx_size_hint_weight_set(wbox, EFL_GFX_SIZE_HINT_EXPAND, EFL_GFX_SIZE_HINT_EXPAND); | 118 | efl_gfx_hint_weight_set(wbox, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND); |
119 | efl_gfx_size_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE); | 119 | efl_gfx_hint_fill_set(wbox, EINA_TRUE, EINA_TRUE); |
120 | 120 | ||
121 | if ((argv[1] != NULL) && | 121 | if ((argv[1] != NULL) && |
122 | (!strcmp(argv[1], "empty"))) | 122 | (!strcmp(argv[1], "empty"))) |
123 | emptystyle = EINA_TRUE; | 123 | emptystyle = EINA_TRUE; |
124 | 124 | ||
125 | priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); | 125 | priv_d.list = list = efl_add(EFL_UI_LIST_CLASS, wbox); |
126 | efl_gfx_size_hint_weight_set(list, EFL_GFX_SIZE_HINT_EXPAND, 0.9); | 126 | efl_gfx_hint_weight_set(list, EFL_GFX_HINT_EXPAND, 0.9); |
127 | 127 | ||
128 | efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL); | 128 | efl_event_callback_add(list, EFL_UI_EVENT_SELECTED, _list_selected, NULL); |
129 | efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL); | 129 | efl_event_callback_add(list, EFL_UI_EVENT_UNSELECTED, _list_unselected, NULL); |
@@ -145,7 +145,7 @@ elm_main(int argc, char **argv) | |||
145 | efl_ui_direction_set(ibox, EFL_UI_DIR_HORIZONTAL); | 145 | efl_ui_direction_set(ibox, EFL_UI_DIR_HORIZONTAL); |
146 | 146 | ||
147 | txt = efl_add(EFL_UI_TEXT_CLASS, ibox); | 147 | txt = efl_add(EFL_UI_TEXT_CLASS, ibox); |
148 | efl_gfx_size_hint_weight_set(txt, 0.95, EFL_GFX_SIZE_HINT_EXPAND); | 148 | efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND); |
149 | efl_text_halign_set(txt, 0.2); | 149 | efl_text_halign_set(txt, 0.2); |
150 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); | 150 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); |
151 | snprintf(buf, sizeof(buf), "empty style item [%d]", i); | 151 | snprintf(buf, sizeof(buf), "empty style item [%d]", i); |
@@ -153,7 +153,7 @@ elm_main(int argc, char **argv) | |||
153 | efl_pack_end(ibox, txt); | 153 | efl_pack_end(ibox, txt); |
154 | 154 | ||
155 | check = efl_add(EFL_UI_CHECK_CLASS, ibox); | 155 | check = efl_add(EFL_UI_CHECK_CLASS, ibox); |
156 | efl_gfx_size_hint_weight_set(check, 0.05, EFL_GFX_SIZE_HINT_EXPAND); | 156 | efl_gfx_hint_weight_set(check, 0.05, EFL_GFX_HINT_EXPAND); |
157 | efl_pack_end(ibox, check); | 157 | efl_pack_end(ibox, check); |
158 | 158 | ||
159 | if (i % 2) | 159 | if (i % 2) |
@@ -223,7 +223,7 @@ elm_main(int argc, char **argv) | |||
223 | 223 | ||
224 | /*select mode */ | 224 | /*select mode */ |
225 | txt = efl_add(EFL_UI_TEXT_CLASS, wbox); | 225 | txt = efl_add(EFL_UI_TEXT_CLASS, wbox); |
226 | efl_gfx_size_hint_weight_set(txt, EFL_GFX_SIZE_HINT_EXPAND, 0.01); | 226 | efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); |
227 | efl_text_halign_set(txt, 0.02); | 227 | efl_text_halign_set(txt, 0.02); |
228 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); | 228 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); |
229 | efl_text_set(txt, "Select Mode"); | 229 | efl_text_set(txt, "Select Mode"); |
@@ -231,7 +231,7 @@ elm_main(int argc, char **argv) | |||
231 | 231 | ||
232 | bbox = efl_add(EFL_UI_BOX_CLASS, wbox); | 232 | bbox = efl_add(EFL_UI_BOX_CLASS, wbox); |
233 | efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); | 233 | efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); |
234 | efl_gfx_size_hint_weight_set(bbox, EFL_GFX_SIZE_HINT_EXPAND, 0.05); | 234 | efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); |
235 | 235 | ||
236 | select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox); | 236 | select_radio = radio = efl_add(EFL_UI_RADIO_CLASS, wbox); |
237 | efl_text_set(radio, "SINGLE"); | 237 | efl_text_set(radio, "SINGLE"); |
@@ -260,7 +260,7 @@ elm_main(int argc, char **argv) | |||
260 | 260 | ||
261 | /* scroll mode */ | 261 | /* scroll mode */ |
262 | txt = efl_add(EFL_UI_TEXT_CLASS, wbox); | 262 | txt = efl_add(EFL_UI_TEXT_CLASS, wbox); |
263 | efl_gfx_size_hint_weight_set(txt, EFL_GFX_SIZE_HINT_EXPAND, 0.01); | 263 | efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01); |
264 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); | 264 | efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); |
265 | efl_text_halign_set(txt, 0.02); | 265 | efl_text_halign_set(txt, 0.02); |
266 | efl_text_set(txt, "Item Scroll"); | 266 | efl_text_set(txt, "Item Scroll"); |
@@ -268,27 +268,27 @@ elm_main(int argc, char **argv) | |||
268 | 268 | ||
269 | priv_d.slider = slider = efl_add(EFL_UI_SLIDER_CLASS, wbox); | 269 | priv_d.slider = slider = efl_add(EFL_UI_SLIDER_CLASS, wbox); |
270 | efl_ui_direction_set(slider, EFL_UI_DIR_HORIZONTAL); | 270 | efl_ui_direction_set(slider, EFL_UI_DIR_HORIZONTAL); |
271 | efl_gfx_size_hint_weight_set(slider, 0.0, 0.05); | 271 | efl_gfx_hint_weight_set(slider, 0.0, 0.05); |
272 | efl_gfx_size_hint_align_set(slider, 0.5, 0.5); | 272 | efl_gfx_hint_align_set(slider, 0.5, 0.5); |
273 | efl_gfx_size_hint_min_set(slider, EINA_SIZE2D(380, 20)); | 273 | efl_gfx_hint_size_min_set(slider, EINA_SIZE2D(380, 20)); |
274 | efl_ui_range_min_max_set(slider, 0.0, 1.0); | 274 | efl_ui_range_min_max_set(slider, 0.0, 1.0); |
275 | efl_pack_end(wbox, slider); | 275 | efl_pack_end(wbox, slider); |
276 | 276 | ||
277 | bbox = efl_add(EFL_UI_BOX_CLASS, wbox); | 277 | bbox = efl_add(EFL_UI_BOX_CLASS, wbox); |
278 | efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); | 278 | efl_ui_direction_set(bbox, EFL_UI_DIR_HORIZONTAL); |
279 | efl_gfx_size_hint_weight_set(bbox, EFL_GFX_SIZE_HINT_EXPAND, 0.05); | 279 | efl_gfx_hint_weight_set(bbox, EFL_GFX_HINT_EXPAND, 0.05); |
280 | 280 | ||
281 | rbox = efl_add(EFL_UI_BOX_CLASS, bbox); | 281 | rbox = efl_add(EFL_UI_BOX_CLASS, bbox); |
282 | efl_ui_direction_set(rbox, EFL_UI_DIR_VERTICAL); | 282 | efl_ui_direction_set(rbox, EFL_UI_DIR_VERTICAL); |
283 | 283 | ||
284 | anim_radio = radio = efl_add(EFL_UI_RADIO_CLASS, rbox); | 284 | anim_radio = radio = efl_add(EFL_UI_RADIO_CLASS, rbox); |
285 | efl_gfx_size_hint_align_set(radio, 0.5, 0.5); | 285 | efl_gfx_hint_align_set(radio, 0.5, 0.5); |
286 | efl_text_set(radio, "ANIMATION OFF"); | 286 | efl_text_set(radio, "ANIMATION OFF"); |
287 | efl_ui_radio_state_value_set(radio, 0); | 287 | efl_ui_radio_state_value_set(radio, 0); |
288 | efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _anim_radio_changed, NULL); | 288 | efl_event_callback_add(radio, EFL_UI_RADIO_EVENT_CHANGED, _anim_radio_changed, NULL); |
289 | efl_pack_end(rbox, radio); | 289 | efl_pack_end(rbox, radio); |
290 | radio = efl_add(EFL_UI_RADIO_CLASS, rbox); | 290 | radio = efl_add(EFL_UI_RADIO_CLASS, rbox); |
291 | efl_gfx_size_hint_align_set(radio, 0.5, 0.5); | 291 | efl_gfx_hint_align_set(radio, 0.5, 0.5); |
292 | efl_text_set(radio, "ANIMATION ON"); | 292 | efl_text_set(radio, "ANIMATION ON"); |
293 | efl_ui_radio_state_value_set(radio, 1); | 293 | efl_ui_radio_state_value_set(radio, 1); |
294 | efl_ui_radio_group_add(radio, anim_radio); | 294 | efl_ui_radio_group_add(radio, anim_radio); |
@@ -301,15 +301,15 @@ elm_main(int argc, char **argv) | |||
301 | 301 | ||
302 | scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); | 302 | scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); |
303 | efl_text_set(scrl_btn, "Scroll Item"); | 303 | efl_text_set(scrl_btn, "Scroll Item"); |
304 | efl_gfx_size_hint_align_set(scrl_btn, 0.5, 0.5); | 304 | efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); |
305 | efl_gfx_size_hint_min_set(scrl_btn, EINA_SIZE2D(200, 25)); | 305 | efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); |
306 | efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_btn_clicked, NULL); | 306 | efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_btn_clicked, NULL); |
307 | efl_pack_end(rbox, scrl_btn); | 307 | efl_pack_end(rbox, scrl_btn); |
308 | 308 | ||
309 | scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); | 309 | scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); |
310 | efl_text_set(scrl_btn, "Scroll Item Align"); | 310 | efl_text_set(scrl_btn, "Scroll Item Align"); |
311 | efl_gfx_size_hint_align_set(scrl_btn, 0.5, 0.5); | 311 | efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); |
312 | efl_gfx_size_hint_min_set(scrl_btn, EINA_SIZE2D(200, 25)); | 312 | efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); |
313 | efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_align_btn_clicked, NULL); | 313 | efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_align_btn_clicked, NULL); |
314 | efl_pack_end(rbox, scrl_btn); | 314 | efl_pack_end(rbox, scrl_btn); |
315 | 315 | ||
diff --git a/src/examples/elementary/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc index 8038782026..3e9254e3ea 100644 --- a/src/examples/elementary/slider_cxx_example.cc +++ b/src/examples/elementary/slider_cxx_example.cc | |||
@@ -59,7 +59,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) | |||
59 | sl6.direction_set(EFL_UI_DIR_HORIZONTAL); | 59 | sl6.direction_set(EFL_UI_DIR_HORIZONTAL); |
60 | sl6.range_min_max_set(0, 10); | 60 | sl6.range_min_max_set(0, 10); |
61 | sl6.hint_fill_set(false, true); | 61 | sl6.hint_fill_set(false, true); |
62 | sl6.hint_weight_set(0, EFL_GFX_SIZE_HINT_EXPAND); | 62 | sl6.hint_weight_set(0, EFL_GFX_HINT_EXPAND); |
63 | bx.pack_end(sl6); | 63 | bx.pack_end(sl6); |
64 | 64 | ||
65 | efl::ui::Slider sl7(instantiate, win); | 65 | efl::ui::Slider sl7(instantiate, win); |
diff --git a/src/examples/evas/evas-hints.c b/src/examples/evas/evas-hints.c index d5f1d37b21..2e55da773a 100644 --- a/src/examples/evas/evas-hints.c +++ b/src/examples/evas/evas-hints.c | |||
@@ -119,7 +119,7 @@ _print_rect_stats(Evas_Object *rect) | |||
119 | printf("\talign hints: h(%f), v(%f)\n", | 119 | printf("\talign hints: h(%f), v(%f)\n", |
120 | x, y); | 120 | x, y); |
121 | 121 | ||
122 | cmin = efl_gfx_size_hint_combined_min_get(rect); | 122 | cmin = efl_gfx_hint_size_combined_min_get(rect); |
123 | printf("\tmin. size hints: h(%d), v(%d)\n", | 123 | printf("\tmin. size hints: h(%d), v(%d)\n", |
124 | cmin.w, cmin.h); | 124 | cmin.w, cmin.h); |
125 | 125 | ||
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index f09265f37b..1857990f42 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #define EFL_GFX_SIZE_HINT_PROTECTED | 1 | #define EFL_GFX_HINT_PROTECTED |
2 | 2 | ||
3 | #include "edje_private.h" | 3 | #include "edje_private.h" |
4 | 4 | ||
@@ -1004,7 +1004,7 @@ _edje_recalc_do(Edje *ed) | |||
1004 | ed->recalc_hints = EINA_FALSE; | 1004 | ed->recalc_hints = EINA_FALSE; |
1005 | 1005 | ||
1006 | edje_object_size_min_calc(ed->obj, &min.w, &min.h); | 1006 | edje_object_size_min_calc(ed->obj, &min.w, &min.h); |
1007 | efl_gfx_size_hint_restricted_min_set(ed->obj, min); | 1007 | efl_gfx_hint_size_restricted_min_set(ed->obj, min); |
1008 | } | 1008 | } |
1009 | 1009 | ||
1010 | if (!ed->collection) return; | 1010 | if (!ed->collection) return; |
@@ -2906,7 +2906,7 @@ _edje_part_recalc_single(Edje *ed, | |||
2906 | 2906 | ||
2907 | efl_canvas_group_need_recalculate_set(ep->object, 1); | 2907 | efl_canvas_group_need_recalculate_set(ep->object, 1); |
2908 | efl_canvas_group_calculate(ep->object); | 2908 | efl_canvas_group_calculate(ep->object); |
2909 | lmin = efl_gfx_size_hint_restricted_min_get(ep->object); | 2909 | lmin = efl_gfx_hint_size_restricted_min_get(ep->object); |
2910 | if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) | 2910 | if (((Edje_Part_Description_Table *)chosen_desc)->table.min.h) |
2911 | { | 2911 | { |
2912 | if (lmin.w > minw) minw = lmin.w; | 2912 | if (lmin.w > minw) minw = lmin.w; |
@@ -2924,7 +2924,7 @@ _edje_part_recalc_single(Edje *ed, | |||
2924 | 2924 | ||
2925 | efl_canvas_group_need_recalculate_set(ep->object, 1); | 2925 | efl_canvas_group_need_recalculate_set(ep->object, 1); |
2926 | efl_canvas_group_calculate(ep->object); | 2926 | efl_canvas_group_calculate(ep->object); |
2927 | lmin = efl_gfx_size_hint_restricted_min_get(ep->object); | 2927 | lmin = efl_gfx_hint_size_restricted_min_get(ep->object); |
2928 | if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) | 2928 | if (((Edje_Part_Description_Box *)chosen_desc)->box.min.h) |
2929 | { | 2929 | { |
2930 | if (lmin.w > minw) minw = lmin.w; | 2930 | if (lmin.w > minw) minw = lmin.w; |
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 0ac67feea8..35772f8854 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h | |||
@@ -54,7 +54,7 @@ extern "C" { | |||
54 | /* Add here all the required ifdef for any @protected method */ | 54 | /* Add here all the required ifdef for any @protected method */ |
55 | #ifdef EFL_BUILD | 55 | #ifdef EFL_BUILD |
56 | # define EFL_PACK_LAYOUT_PROTECTED | 56 | # define EFL_PACK_LAYOUT_PROTECTED |
57 | # define EFL_GFX_SIZE_HINT_PROTECTED | 57 | # define EFL_GFX_HINT_PROTECTED |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | /** | 60 | /** |
@@ -134,7 +134,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; | |||
134 | #include "interfaces/efl_gfx_gradient_radial.eo.h" | 134 | #include "interfaces/efl_gfx_gradient_radial.eo.h" |
135 | #include "interfaces/efl_gfx_filter.eo.h" | 135 | #include "interfaces/efl_gfx_filter.eo.h" |
136 | #include "interfaces/efl_gfx_blur.eo.h" | 136 | #include "interfaces/efl_gfx_blur.eo.h" |
137 | #include "interfaces/efl_gfx_size_hint.eo.h" | 137 | #include "interfaces/efl_gfx_hint.eo.h" |
138 | #include "interfaces/efl_gfx_color_class.eo.h" | 138 | #include "interfaces/efl_gfx_color_class.eo.h" |
139 | #include "interfaces/efl_gfx_text_class.eo.h" | 139 | #include "interfaces/efl_gfx_text_class.eo.h" |
140 | #include "interfaces/efl_gfx_size_class.eo.h" | 140 | #include "interfaces/efl_gfx_size_class.eo.h" |
diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo index 5f40f6f17a..4c4eb21e98 100644 --- a/src/lib/efl/interfaces/efl_gfx_entity.eo +++ b/src/lib/efl/interfaces/efl_gfx_entity.eo | |||
@@ -31,7 +31,7 @@ interface @beta Efl.Gfx.Entity { | |||
31 | 31 | ||
32 | Note that setting the actual size of an object might be the job | 32 | Note that setting the actual size of an object might be the job |
33 | of its container, so this function might have no effect. | 33 | of its container, so this function might have no effect. |
34 | Look at @Efl.Gfx.Size_Hint instead, when manipulating | 34 | Look at @Efl.Gfx.Hint instead, when manipulating |
35 | widgets. | 35 | widgets. |
36 | ]] | 36 | ]] |
37 | } | 37 | } |
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo index af01fe08be..2cbcf87676 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_hint.eo | |||
@@ -1,12 +1,12 @@ | |||
1 | import eina_types; |