summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-03-11 16:05:08 +0900
committerHermet Park <hermetpark@gmail.com>2019-03-11 16:05:08 +0900
commit43e122d1de10c8c89d835101cc66794a14de8c84 (patch)
treef91e3da2638caa8ae2499fa28f73718a0ecc249a /src/lib/elementary
parent2538e19e77ef839a2fd1177890bb15016b9e8ab1 (diff)
parent23d0076346e64456280bd9b9c2d1d2659d065fd2 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/Efl_Ui.h13
-rw-r--r--src/lib/elementary/Elementary.h7
-rw-r--r--src/lib/elementary/efl_access_object.eo8
-rw-r--r--src/lib/elementary/efl_access_text.eo1
-rw-r--r--src/lib/elementary/efl_page_transition_scroll.c38
-rw-r--r--src/lib/elementary/efl_ui.eot23
-rw-r--r--src/lib/elementary/efl_ui_animation_view.c50
-rw-r--r--src/lib/elementary/efl_ui_animation_view.eo5
-rw-r--r--src/lib/elementary/efl_ui_bg.c76
-rw-r--r--src/lib/elementary/efl_ui_bg.eo6
-rw-r--r--src/lib/elementary/efl_ui_bg_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy.eo14
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.h32
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_box.c8
-rw-r--r--src/lib/elementary/efl_ui_box.eo1
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c344
-rw-r--r--src/lib/elementary/efl_ui_box_private.h2
-rw-r--r--src/lib/elementary/efl_ui_button.c14
-rw-r--r--src/lib/elementary/efl_ui_button.eo5
-rw-r--r--src/lib/elementary/efl_ui_button_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_button_legacy.eo15
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_eo.c47
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_eo.h30
-rw-r--r--src/lib/elementary/efl_ui_button_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_caching_factory.c5
-rw-r--r--src/lib/elementary/efl_ui_calendar.c10
-rw-r--r--src/lib/elementary/efl_ui_calendar.eo4
-rw-r--r--src/lib/elementary/efl_ui_check.c28
-rw-r--r--src/lib/elementary/efl_ui_check.eo3
-rw-r--r--src/lib/elementary/efl_ui_check_eo.legacy.c12
-rw-r--r--src/lib/elementary/efl_ui_check_eo.legacy.h38
-rw-r--r--src/lib/elementary/efl_ui_check_legacy.eo18
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_eo.c47
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_eo.h32
-rw-r--r--src/lib/elementary/efl_ui_check_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_clock.c27
-rw-r--r--src/lib/elementary/efl_ui_clock.eo3
-rw-r--r--src/lib/elementary/efl_ui_container_layout.c158
-rw-r--r--src/lib/elementary/efl_ui_container_layout.h42
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c8
-rw-r--r--src/lib/elementary/efl_ui_datepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_dnd_container.eo2
-rw-r--r--src/lib/elementary/efl_ui_flip.c24
-rw-r--r--src/lib/elementary/efl_ui_flip.eo7
-rw-r--r--src/lib/elementary/efl_ui_flip_eo.legacy.c30
-rw-r--r--src/lib/elementary/efl_ui_flip_eo.legacy.h140
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy.h70
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_flip_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.c4
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen.eo27
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.c60
-rw-r--r--src/lib/elementary/efl_ui_focus_parent_provider_gen_eo.h78
-rw-r--r--src/lib/elementary/efl_ui_frame.c9
-rw-r--r--src/lib/elementary/efl_ui_frame.eo3
-rw-r--r--src/lib/elementary/efl_ui_frame_eo.legacy.c30
-rw-r--r--src/lib/elementary/efl_ui_frame_eo.legacy.h78
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy.eo14
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy.h2
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy_eo.h31
-rw-r--r--src/lib/elementary/efl_ui_frame_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_grid.c16
-rw-r--r--src/lib/elementary/efl_ui_grid.eo2
-rw-r--r--src/lib/elementary/efl_ui_grid_default_item.c4
-rw-r--r--src/lib/elementary/efl_ui_grid_default_item.eo4
-rw-r--r--src/lib/elementary/efl_ui_image.c325
-rw-r--r--src/lib/elementary/efl_ui_image.eo12
-rw-r--r--src/lib/elementary/efl_ui_image_factory.c5
-rw-r--r--src/lib/elementary/efl_ui_image_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_image_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_image_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_image_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c148
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo8
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_eo.legacy.c12
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_eo.legacy.h45
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable_pan.eo1
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c18
-rw-r--r--src/lib/elementary/efl_ui_item.c8
-rw-r--r--src/lib/elementary/efl_ui_item.eo2
-rw-r--r--src/lib/elementary/efl_ui_layout.c357
-rw-r--r--src/lib/elementary/efl_ui_layout.eo80
-rw-r--r--src/lib/elementary/efl_ui_layout_base.eo95
-rw-r--r--src/lib/elementary/efl_ui_layout_factory.c5
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy.eo8
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_layout_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_layout_pack.c22
-rw-r--r--src/lib/elementary/efl_ui_layout_part_box.eo1
-rw-r--r--src/lib/elementary/efl_ui_layout_part_table.eo1
-rw-r--r--src/lib/elementary/efl_ui_list.c20
-rw-r--r--src/lib/elementary/efl_ui_list.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_default_item.c4
-rw-r--r--src/lib/elementary/efl_ui_list_empty_item.c4
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo4
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c8
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.c10
-rw-r--r--src/lib/elementary/efl_ui_navigation_layout.eo2
-rw-r--r--src/lib/elementary/efl_ui_nstate.c6
-rw-r--r--src/lib/elementary/efl_ui_nstate.eo2
-rw-r--r--src/lib/elementary/efl_ui_pager.c28
-rw-r--r--src/lib/elementary/efl_ui_pager.eo2
-rw-r--r--src/lib/elementary/efl_ui_pan.c4
-rw-r--r--src/lib/elementary/efl_ui_panel.c25
-rw-r--r--src/lib/elementary/efl_ui_panel.eo6
-rw-r--r--src/lib/elementary/efl_ui_panes.c15
-rw-r--r--src/lib/elementary/efl_ui_panes.eo5
-rw-r--r--src/lib/elementary/efl_ui_panes_eo.legacy.c12
-rw-r--r--src/lib/elementary/efl_ui_panes_eo.legacy.h49
-rw-r--r--src/lib/elementary/efl_ui_panes_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_panes_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_panes_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_panes_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_popup.c28
-rw-r--r--src/lib/elementary/efl_ui_popup.eo2
-rw-r--r--src/lib/elementary/efl_ui_popup_part_backwall.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c27
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo2
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy.eo12
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_eo.c47
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_progressbar_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_radio.c23
-rw-r--r--src/lib/elementary/efl_ui_radio.eo3
-rw-r--r--src/lib/elementary/efl_ui_radio_eo.legacy.c30
-rw-r--r--src/lib/elementary/efl_ui_radio_eo.legacy.h85
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy.eo12
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_eo.c47
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_radio_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_relative_layout.eo2
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c13
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.eo1
-rw-r--r--src/lib/elementary/efl_ui_scroller.c171
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo7
-rw-r--r--src/lib/elementary/efl_ui_selection_manager.c4
-rw-r--r--src/lib/elementary/efl_ui_slider.c22
-rw-r--r--src/lib/elementary/efl_ui_slider.eo5
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.eo3
-rw-r--r--src/lib/elementary/efl_ui_spin.c10
-rw-r--r--src/lib/elementary/efl_ui_spin.eo4
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c21
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_stack.c617
-rw-r--r--src/lib/elementary/efl_ui_stack.eo2
-rw-r--r--src/lib/elementary/efl_ui_stack_private.h17
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.c13
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.eo4
-rw-r--r--src/lib/elementary/efl_ui_tab_page.c9
-rw-r--r--src/lib/elementary/efl_ui_tab_page.eo2
-rw-r--r--src/lib/elementary/efl_ui_table.c73
-rw-r--r--src/lib/elementary/efl_ui_table.eo17
-rw-r--r--src/lib/elementary/efl_ui_table_layout.c375
-rw-r--r--src/lib/elementary/efl_ui_table_private.h7
-rw-r--r--src/lib/elementary/efl_ui_tags.c10
-rw-r--r--src/lib/elementary/efl_ui_tags.eo4
-rw-r--r--src/lib/elementary/efl_ui_text.c125
-rw-r--r--src/lib/elementary/efl_ui_text.eo8
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.c2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.c16
-rw-r--r--src/lib/elementary/efl_ui_textpath.c20
-rw-r--r--src/lib/elementary/efl_ui_textpath.eo3
-rw-r--r--src/lib/elementary/efl_ui_textpath_eo.legacy.c30
-rw-r--r--src/lib/elementary/efl_ui_textpath_eo.legacy.h85
-rw-r--r--src/lib/elementary/efl_ui_textpath_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_textpath_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_textpath_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_textpath_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c8
-rw-r--r--src/lib/elementary/efl_ui_timepicker.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.c35
-rw-r--r--src/lib/elementary/efl_ui_video.eo7
-rw-r--r--src/lib/elementary/efl_ui_video_eo.legacy.c24
-rw-r--r--src/lib/elementary/efl_ui_video_eo.legacy.h70
-rw-r--r--src/lib/elementary/efl_ui_video_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_video_legacy.h2
-rw-r--r--src/lib/elementary/efl_ui_video_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_video_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_video_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_widget.c708
-rw-r--r--src/lib/elementary/efl_ui_widget.eo289
-rw-r--r--src/lib/elementary/efl_ui_widget_common.c174
-rw-r--r--src/lib/elementary/efl_ui_widget_common.h35
-rw-r--r--src/lib/elementary/efl_ui_widget_eo.legacy.c90
-rw-r--r--src/lib/elementary/efl_ui_widget_eo.legacy.h334
-rw-r--r--src/lib/elementary/efl_ui_widget_factory.c6
-rw-r--r--src/lib/elementary/efl_ui_widget_part_bg.eo4
-rw-r--r--src/lib/elementary/efl_ui_win.c1042
-rw-r--r--src/lib/elementary/efl_ui_win.eo246
-rw-r--r--src/lib/elementary/efl_ui_win_inlined.c6
-rw-r--r--src/lib/elementary/efl_ui_win_inlined_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_win_inlined_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_win_inlined_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_win_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_win_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_win_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_win_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_win_part.eo4
-rw-r--r--src/lib/elementary/efl_ui_win_socket.c6
-rw-r--r--src/lib/elementary/efl_ui_win_socket_legacy.eo9
-rw-r--r--src/lib/elementary/efl_ui_win_socket_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_win_socket_legacy_eo.h26
-rw-r--r--src/lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/elc_combobox.c16
-rw-r--r--src/lib/elementary/elc_ctxpopup.c34
-rw-r--r--src/lib/elementary/elc_ctxpopup_legacy.h4
-rw-r--r--src/lib/elementary/elc_fileselector.c22
-rw-r--r--src/lib/elementary/elc_fileselector_button.c16
-rw-r--r--src/lib/elementary/elc_fileselector_button_legacy.h2
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c30
-rw-r--r--src/lib/elementary/elc_fileselector_entry_legacy.h2
-rw-r--r--src/lib/elementary/elc_fileselector_legacy.h4
-rw-r--r--src/lib/elementary/elc_hoversel.c28
-rw-r--r--src/lib/elementary/elc_hoversel_legacy.h4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c24
-rw-r--r--src/lib/elementary/elc_multibuttonentry.h3
-rw-r--r--src/lib/elementary/elc_multibuttonentry_eo.h4
-rw-r--r--src/lib/elementary/elc_multibuttonentry_legacy.h4
-rw-r--r--src/lib/elementary/elc_naviframe.c12
-rw-r--r--src/lib/elementary/elc_naviframe_legacy.h4
-rw-r--r--src/lib/elementary/elc_player.c8
-rw-r--r--src/lib/elementary/elc_popup.c18
-rw-r--r--src/lib/elementary/elc_popup_legacy.h2
-rw-r--r--src/lib/elementary/elm_access.c6
-rw-r--r--src/lib/elementary/elm_access.eo15
-rw-r--r--src/lib/elementary/elm_access_eo.c51
-rw-r--r--src/lib/elementary/elm_access_eo.h24
-rw-r--r--src/lib/elementary/elm_access_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_actionslider.c12
-rw-r--r--src/lib/elementary/elm_actionslider.eo80
-rw-r--r--src/lib/elementary/elm_actionslider_eo.c82
-rw-r--r--src/lib/elementary/elm_actionslider_eo.h134
-rw-r--r--src/lib/elementary/elm_actionslider_eo.legacy.c42
-rw-r--r--src/lib/elementary/elm_actionslider_eo.legacy.h113
-rw-r--r--src/lib/elementary/elm_actionslider_legacy.h2
-rw-r--r--src/lib/elementary/elm_atspi_app_object.eo1
-rw-r--r--src/lib/elementary/elm_atspi_app_object.h3
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c212
-rw-r--r--src/lib/elementary/elm_atspi_bridge.eo1
-rw-r--r--src/lib/elementary/elm_atspi_bridge.h3
-rw-r--r--src/lib/elementary/elm_bg_eo.h1
-rw-r--r--src/lib/elementary/elm_bg_legacy.h2
-rw-r--r--src/lib/elementary/elm_box.c12
-rw-r--r--src/lib/elementary/elm_box.eo258
-rw-r--r--src/lib/elementary/elm_box_eo.c199
-rw-r--r--src/lib/elementary/elm_box_eo.h305
-rw-r--r--src/lib/elementary/elm_box_eo.legacy.c102
-rw-r--r--src/lib/elementary/elm_box_eo.legacy.h280
-rw-r--r--src/lib/elementary/elm_box_legacy.h2
-rw-r--r--src/lib/elementary/elm_bubble.c4
-rw-r--r--src/lib/elementary/elm_bubble.eo44
-rw-r--r--src/lib/elementary/elm_bubble_eo.c55
-rw-r--r--src/lib/elementary/elm_bubble_eo.h74
-rw-r--r--src/lib/elementary/elm_bubble_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_bubble_eo.legacy.h67
-rw-r--r--src/lib/elementary/elm_bubble_legacy.h2
-rw-r--r--src/lib/elementary/elm_button.h3
-rw-r--r--src/lib/elementary/elm_button_legacy.h2
-rw-r--r--src/lib/elementary/elm_calendar.c14
-rw-r--r--src/lib/elementary/elm_calendar.eo426
-rw-r--r--src/lib/elementary/elm_calendar_eo.c212
-rw-r--r--src/lib/elementary/elm_calendar_eo.h574
-rw-r--r--src/lib/elementary/elm_calendar_eo.legacy.c132
-rw-r--r--src/lib/elementary/elm_calendar_eo.legacy.h524
-rw-r--r--src/lib/elementary/elm_calendar_item.eo17
-rw-r--r--src/lib/elementary/elm_calendar_item_eo.c85
-rw-r--r--src/lib/elementary/elm_calendar_item_eo.h45
-rw-r--r--src/lib/elementary/elm_calendar_item_eo.legacy.h19
-rw-r--r--src/lib/elementary/elm_calendar_legacy.h2
-rw-r--r--src/lib/elementary/elm_check.h1
-rw-r--r--src/lib/elementary/elm_check_legacy.h4
-rw-r--r--src/lib/elementary/elm_clock.c8
-rw-r--r--src/lib/elementary/elm_clock.eo172
-rw-r--r--src/lib/elementary/elm_clock_eo.c249
-rw-r--r--src/lib/elementary/elm_clock_eo.h305
-rw-r--r--src/lib/elementary/elm_clock_eo.legacy.c84
-rw-r--r--src/lib/elementary/elm_clock_eo.legacy.h281
-rw-r--r--src/lib/elementary/elm_clock_legacy.h2
-rw-r--r--src/lib/elementary/elm_code_diff_widget.c10
-rw-r--r--src/lib/elementary/elm_code_widget.c89
-rw-r--r--src/lib/elementary/elm_code_widget.eo24
-rw-r--r--src/lib/elementary/elm_code_widget_eo.legacy.c270
-rw-r--r--src/lib/elementary/elm_code_widget_eo.legacy.h550
-rw-r--r--src/lib/elementary/elm_code_widget_legacy.eo5
-rw-r--r--src/lib/elementary/elm_code_widget_legacy.h2
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.c27
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.h24
-rw-r--r--src/lib/elementary/elm_code_widget_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_code_widget_selection.c18
-rw-r--r--src/lib/elementary/elm_code_widget_text.c12
-rw-r--r--src/lib/elementary/elm_code_widget_undo.c4
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_color_item.eo53
-rw-r--r--src/lib/elementary/elm_color_item_eo.c137
-rw-r--r--src/lib/elementary/elm_color_item_eo.h75
-rw-r--r--src/lib/elementary/elm_color_item_eo.legacy.c24
-rw-r--r--src/lib/elementary/elm_color_item_eo.legacy.h68
-rw-r--r--src/lib/elementary/elm_colorselector.c16
-rw-r--r--src/lib/elementary/elm_colorselector.eo126
-rw-r--r--src/lib/elementary/elm_colorselector_eo.c151
-rw-r--r--src/lib/elementary/elm_colorselector_eo.h203
-rw-r--r--src/lib/elementary/elm_colorselector_eo.legacy.c60
-rw-r--r--src/lib/elementary/elm_colorselector_eo.legacy.h161
-rw-r--r--src/lib/elementary/elm_colorselector_legacy.h2
-rw-r--r--src/lib/elementary/elm_conform.c14
-rw-r--r--src/lib/elementary/elm_conformant.eo19
-rw-r--r--src/lib/elementary/elm_conformant_eo.c51
-rw-r--r--src/lib/elementary/elm_conformant_eo.h56
-rw-r--r--src/lib/elementary/elm_conformant_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo249
-rw-r--r--src/lib/elementary/elm_ctxpopup_eo.c229
-rw-r--r--src/lib/elementary/elm_ctxpopup_eo.h340
-rw-r--r--src/lib/elementary/elm_ctxpopup_eo.legacy.c114
-rw-r--r--src/lib/elementary/elm_ctxpopup_eo.legacy.h316
-rw-r--r--src/lib/elementary/elm_ctxpopup_item.eo76
-rw-r--r--src/lib/elementary/elm_ctxpopup_item_eo.c142
-rw-r--r--src/lib/elementary/elm_ctxpopup_item_eo.h97
-rw-r--r--src/lib/elementary/elm_ctxpopup_item_eo.legacy.c30
-rw-r--r--src/lib/elementary/elm_ctxpopup_item_eo.legacy.h90
-rw-r--r--src/lib/elementary/elm_dayselector.c10
-rw-r--r--src/lib/elementary/elm_dayselector.eo163
-rw-r--r--src/lib/elementary/elm_dayselector_eo.c131
-rw-r--r--src/lib/elementary/elm_dayselector_eo.h194
-rw-r--r--src/lib/elementary/elm_dayselector_eo.legacy.c60
-rw-r--r--src/lib/elementary/elm_dayselector_eo.legacy.h182
-rw-r--r--src/lib/elementary/elm_dayselector_item.eo8
-rw-r--r--src/lib/elementary/elm_dayselector_item_eo.c35
-rw-r--r--src/lib/elementary/elm_dayselector_item_eo.h24
-rw-r--r--src/lib/elementary/elm_dayselector_item_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_dayselector_legacy.h2
-rw-r--r--src/lib/elementary/elm_dbus_menu.c2
-rw-r--r--src/lib/elementary/elm_diskselector.c15
-rw-r--r--src/lib/elementary/elm_diskselector.eo213
-rw-r--r--src/lib/elementary/elm_diskselector_eo.c227
-rw-r--r--src/lib/elementary/elm_diskselector_eo.h232
-rw-r--r--src/lib/elementary/elm_diskselector_eo.legacy.c72
-rw-r--r--src/lib/elementary/elm_diskselector_eo.legacy.h223
-rw-r--r--src/lib/elementary/elm_diskselector_item.eo90
-rw-r--r--src/lib/elementary/elm_diskselector_item_eo.c109
-rw-r--r--src/lib/elementary/elm_diskselector_item_eo.h103
-rw-r--r--src/lib/elementary/elm_diskselector_item_eo.legacy.c24
-rw-r--r--src/lib/elementary/elm_diskselector_item_eo.legacy.h96
-rw-r--r--src/lib/elementary/elm_diskselector_legacy.h4
-rw-r--r--src/lib/elementary/elm_entry.c134
-rw-r--r--src/lib/elementary/elm_entry.eo927
-rw-r--r--src/lib/elementary/elm_entry_eo.c1190
-rw-r--r--src/lib/elementary/elm_entry_eo.h1448
-rw-r--r--src/lib/elementary/elm_entry_eo.legacy.c582
-rw-r--r--src/lib/elementary/elm_entry_eo.legacy.h1252
-rw-r--r--src/lib/elementary/elm_entry_legacy.h2
-rw-r--r--src/lib/elementary/elm_fileselector.eo65
-rw-r--r--src/lib/elementary/elm_fileselector_button.eo30
-rw-r--r--src/lib/elementary/elm_fileselector_button_eo.c149
-rw-r--r--src/lib/elementary/elm_fileselector_button_eo.h32
-rw-r--r--src/lib/elementary/elm_fileselector_button_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo28
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.c91
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.h56
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_fileselector_eo.c207
-rw-r--r--src/lib/elementary/elm_fileselector_eo.h87
-rw-r--r--src/lib/elementary/elm_fileselector_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_fileselector_eo.legacy.h47
-rw-r--r--src/lib/elementary/elm_flip.h3
-rw-r--r--src/lib/elementary/elm_flipselector.c16
-rw-r--r--src/lib/elementary/elm_flipselector.eo175
-rw-r--r--src/lib/elementary/elm_flipselector_eo.c159
-rw-r--r--src/lib/elementary/elm_flipselector_eo.h212
-rw-r--r--src/lib/elementary/elm_flipselector_eo.legacy.c60
-rw-r--r--src/lib/elementary/elm_flipselector_eo.legacy.h189
-rw-r--r--src/lib/elementary/elm_flipselector_item.eo55
-rw-r--r--src/lib/elementary/elm_flipselector_item_eo.c105
-rw-r--r--src/lib/elementary/elm_flipselector_item_eo.h87
-rw-r--r--src/lib/elementary/elm_flipselector_item_eo.legacy.c24
-rw-r--r--src/lib/elementary/elm_flipselector_item_eo.legacy.h80
-rw-r--r--src/lib/elementary/elm_flipselector_legacy.h4
-rw-r--r--src/lib/elementary/elm_focus_legacy.c20
-rw-r--r--src/lib/elementary/elm_frame.h3
-rw-r--r--src/lib/elementary/elm_general.h92
-rw-r--r--src/lib/elementary/elm_gengrid.c55
-rw-r--r--src/lib/elementary/elm_gengrid.eo553
-rw-r--r--src/lib/elementary/elm_gengrid_eo.c517
-rw-r--r--src/lib/elementary/elm_gengrid_eo.h782
-rw-r--r--src/lib/elementary/elm_gengrid_eo.legacy.c228
-rw-r--r--src/lib/elementary/elm_gengrid_eo.legacy.h627
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo236
-rw-r--r--src/lib/elementary/elm_gengrid_item_eo.c243
-rw-r--r--src/lib/elementary/elm_gengrid_item_eo.h315
-rw-r--r--src/lib/elementary/elm_gengrid_item_eo.legacy.c102
-rw-r--r--src/lib/elementary/elm_gengrid_item_eo.legacy.h308
-rw-r--r--src/lib/elementary/elm_gengrid_legacy.h4
-rw-r--r--src/lib/elementary/elm_gengrid_pan.eo18
-rw-r--r--src/lib/elementary/elm_gengrid_pan_eo.c67
-rw-r--r--src/lib/elementary/elm_gengrid_pan_eo.h24
-rw-r--r--src/lib/elementary/elm_gengrid_pan_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_genlist.c70
-rw-r--r--src/lib/elementary/elm_genlist.eo598
-rw-r--r--src/lib/elementary/elm_genlist_eo.c686
-rw-r--r--src/lib/elementary/elm_genlist_eo.h1014
-rw-r--r--src/lib/elementary/elm_genlist_eo.legacy.c258
-rw-r--r--src/lib/elementary/elm_genlist_eo.legacy.h704
-rw-r--r--src/lib/elementary/elm_genlist_item.eo437
-rw-r--r--src/lib/elementary/elm_genlist_item_eo.c409
-rw-r--r--src/lib/elementary/elm_genlist_item_eo.h496
-rw-r--r--src/lib/elementary/elm_genlist_item_eo.legacy.c180
-rw-r--r--src/lib/elementary/elm_genlist_item_eo.legacy.h489
-rw-r--r--src/lib/elementary/elm_genlist_legacy.h4
-rw-r--r--src/lib/elementary/elm_genlist_pan.eo24
-rw-r--r--src/lib/elementary/elm_genlist_pan_eo.c67
-rw-r--r--src/lib/elementary/elm_genlist_pan_eo.h24
-rw-r--r--src/lib/elementary/elm_genlist_pan_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_gesture_layer.c14
-rw-r--r--src/lib/elementary/elm_gesture_layer.eo167
-rw-r--r--src/lib/elementary/elm_gesture_layer_eo.c208
-rw-r--r--src/lib/elementary/elm_gesture_layer_eo.h229
-rw-r--r--src/lib/elementary/elm_gesture_layer_eo.legacy.c72
-rw-r--r--src/lib/elementary/elm_gesture_layer_eo.legacy.h222
-rw-r--r--src/lib/elementary/elm_gesture_layer_legacy.h2
-rw-r--r--src/lib/elementary/elm_glview.c2
-rw-r--r--src/lib/elementary/elm_glview.eo234
-rw-r--r--src/lib/elementary/elm_glview_eo.c105
-rw-r--r--src/lib/elementary/elm_glview_eo.h294
-rw-r--r--src/lib/elementary/elm_glview_eo.legacy.c36
-rw-r--r--src/lib/elementary/elm_glview_eo.legacy.h216
-rw-r--r--src/lib/elementary/elm_glview_legacy.h2
-rw-r--r--src/lib/elementary/elm_grid.c10
-rw-r--r--src/lib/elementary/elm_grid.eo63
-rw-r--r--src/lib/elementary/elm_grid_eo.c75
-rw-r--r--src/lib/elementary/elm_grid_eo.h96
-rw-r--r--src/lib/elementary/elm_grid_eo.legacy.c36
-rw-r--r--src/lib/elementary/elm_grid_eo.legacy.h89
-rw-r--r--src/lib/elementary/elm_grid_legacy.h2
-rw-r--r--src/lib/elementary/elm_hover.c10
-rw-r--r--src/lib/elementary/elm_hover.eo80
-rw-r--r--src/lib/elementary/elm_hover_eo.c105
-rw-r--r--src/lib/elementary/elm_hover_eo.h112
-rw-r--r--src/lib/elementary/elm_hover_eo.legacy.c24
-rw-r--r--src/lib/elementary/elm_hover_eo.legacy.h88
-rw-r--r--src/lib/elementary/elm_hover_legacy.h2
-rw-r--r--src/lib/elementary/elm_hoversel.eo113
-rw-r--r--src/lib/elementary/elm_hoversel_eo.c198
-rw-r--r--src/lib/elementary/elm_hoversel_eo.h206
-rw-r--r--src/lib/elementary/elm_hoversel_eo.legacy.c72
-rw-r--r--src/lib/elementary/elm_hoversel_eo.legacy.h165
-rw-r--r--src/lib/elementary/elm_hoversel_item.eo33
-rw-r--r--src/lib/elementary/elm_hoversel_item_eo.c83
-rw-r--r--src/lib/elementary/elm_hoversel_item_eo.h58
-rw-r--r--src/lib/elementary/elm_hoversel_item_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_hoversel_item_eo.legacy.h51
-rw-r--r--src/lib/elementary/elm_icon.c40
-rw-r--r--src/lib/elementary/elm_icon.eo19
-rw-r--r--src/lib/elementary/elm_icon_eo.c47
-rw-r--r--src/lib/elementary/elm_icon_eo.h40
-rw-r--r--src/lib/elementary/elm_icon_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_icon_legacy.h2
-rw-r--r--src/lib/elementary/elm_image.h3
-rw-r--r--src/lib/elementary/elm_index.c12
-rw-r--r--src/lib/elementary/elm_index.eo211
-rw-r--r--src/lib/elementary/elm_index_eo.c327
-rw-r--r--src/lib/elementary/elm_index_eo.h382
-rw-r--r--src/lib/elementary/elm_index_eo.legacy.c126
-rw-r--r--src/lib/elementary/elm_index_eo.legacy.h341
-rw-r--r--src/lib/elementary/elm_index_item.eo50
-rw-r--r--src/lib/elementary/elm_index_item_eo.c109
-rw-r--r--src/lib/elementary/elm_index_item_eo.h71
-rw-r--r--src/lib/elementary/elm_index_item_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_index_item_eo.legacy.h64
-rw-r--r--src/lib/elementary/elm_index_legacy.h4
-rw-r--r--src/lib/elementary/elm_interface_fileselector.c5
-rw-r--r--src/lib/elementary/elm_interface_fileselector.eo173
-rw-r--r--src/lib/elementary/elm_interface_fileselector.h5
-rw-r--r--src/lib/elementary/elm_interface_fileselector_eo.c236
-rw-r--r--src/lib/elementary/elm_interface_fileselector_eo.h326
-rw-r--r--src/lib/elementary/elm_interface_fileselector_eo.legacy.h73
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c3
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h5
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_inwin.eo28
-rw-r--r--src/lib/elementary/elm_inwin_eo.c58
-rw-r--r--src/lib/elementary/elm_inwin_eo.h40
-rw-r--r--src/lib/elementary/elm_inwin_eo.legacy.c6
-rw-r--r--src/lib/elementary/elm_inwin_eo.legacy.h33
-rw-r--r--src/lib/elementary/elm_inwin_legacy.h2
-rw-r--r--src/lib/elementary/elm_label.c10
-rw-r--r--src/lib/elementary/elm_label.eo133
-rw-r--r--src/lib/elementary/elm_label_eo.c219
-rw-r--r--src/lib/elementary/elm_label_eo.h258
-rw-r--r--src/lib/elementary/elm_label_eo.legacy.c78
-rw-r--r--src/lib/elementary/elm_label_eo.legacy.h243
-rw-r--r--src/lib/elementary/elm_label_legacy.h2
-rw-r--r--src/lib/elementary/elm_layout.h3
-rw-r--r--src/lib/elementary/elm_list.c46
-rw-r--r--src/lib/elementary/elm_list.eo439
-rw-r--r--src/lib/elementary/elm_list_eo.c368
-rw-r--r--src/lib/elementary/elm_list_eo.h640
-rw-r--r--src/lib/elementary/elm_list_eo.legacy.c150
-rw-r--r--src/lib/elementary/elm_list_eo.legacy.h547
-rw-r--r--src/lib/elementary/elm_list_item.eo123
-rw-r--r--src/lib/elementary/elm_list_item_eo.c195
-rw-r--r--src/lib/elementary/elm_list_item_eo.h148
-rw-r--r--src/lib/elementary/elm_list_item_eo.legacy.c54
-rw-r--r--src/lib/elementary/elm_list_item_eo.legacy.h141
-rw-r--r--src/lib/elementary/elm_list_legacy.h4
-rw-r--r--src/lib/elementary/elm_main.c88
-rw-r--r--src/lib/elementary/elm_map.c61
-rw-r--r--src/lib/elementary/elm_map.eo532
-rw-r--r--src/lib/elementary/elm_map_eo.c365
-rw-r--r--src/lib/elementary/elm_map_eo.h731
-rw-r--r--src/lib/elementary/elm_map_eo.legacy.c192
-rw-r--r--src/lib/elementary/elm_map_eo.legacy.h616
-rw-r--r--src/lib/elementary/elm_map_legacy.h2
-rw-r--r--src/lib/elementary/elm_map_pan.eo34
-rw-r--r--src/lib/elementary/elm_map_pan_eo.c67
-rw-r--r--src/lib/elementary/elm_map_pan_eo.h24
-rw-r--r--src/lib/elementary/elm_map_pan_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_mapbuf.c13
-rw-r--r--src/lib/elementary/elm_mapbuf.eo128
-rw-r--r--src/lib/elementary/elm_mapbuf_eo.c230
-rw-r--r--src/lib/elementary/elm_mapbuf_eo.h188
-rw-r--r--src/lib/elementary/elm_mapbuf_eo.legacy.c60
-rw-r--r--src/lib/elementary/elm_mapbuf_eo.legacy.h181
-rw-r--r--src/lib/elementary/elm_mapbuf_legacy.h2
-rw-r--r--src/lib/elementary/elm_menu.c20
-rw-r--r--src/lib/elementary/elm_menu.eo106
-rw-r--r--src/lib/elementary/elm_menu_eo.c132
-rw-r--r--src/lib/elementary/elm_menu_eo.h158
-rw-r--r--src/lib/elementary/elm_menu_eo.legacy.c54
-rw-r--r--src/lib/elementary/elm_menu_eo.legacy.h127
-rw-r--r--src/lib/elementary/elm_menu_item.eo121
-rw-r--r--src/lib/elementary/elm_menu_item_eo.c205
-rw-r--r--src/lib/elementary/elm_menu_item_eo.h175
-rw-r--r--src/lib/elementary/elm_menu_item_eo.legacy.c66
-rw-r--r--src/lib/elementary/elm_menu_item_eo.legacy.h168
-rw-r--r--src/lib/elementary/elm_menu_legacy.h4
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo199
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.c224
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.h346
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.legacy.c108
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.legacy.h269
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item.eo38
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item_eo.c121
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item_eo.h67
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item_eo.legacy.c24
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item_eo.legacy.h60
-rw-r--r--src/lib/elementary/elm_naviframe.eo162
-rw-r--r--src/lib/elementary/elm_naviframe_eo.c233
-rw-r--r--src/lib/elementary/elm_naviframe_eo.h289
-rw-r--r--src/lib/elementary/elm_naviframe_eo.legacy.c84
-rw-r--r--src/lib/elementary/elm_naviframe_eo.legacy.h246
-rw-r--r--src/lib/elementary/elm_naviframe_item.eo78
-rw-r--r--src/lib/elementary/elm_naviframe_item_eo.c102
-rw-r--r--src/lib/elementary/elm_naviframe_item_eo.h99
-rw-r--r--src/lib/elementary/elm_naviframe_item_eo.legacy.c30
-rw-r--r--src/lib/elementary/elm_naviframe_item_eo.legacy.h92
-rw-r--r--src/lib/elementary/elm_notify.c12
-rw-r--r--src/lib/elementary/elm_notify.eo98
-rw-r--r--src/lib/elementary/elm_notify_eo.c179
-rw-r--r--src/lib/elementary/elm_notify_eo.h145
-rw-r--r--src/lib/elementary/elm_notify_eo.legacy.c42
-rw-r--r--src/lib/elementary/elm_notify_eo.legacy.h114
-rw-r--r--src/lib/elementary/elm_notify_legacy.h2
-rw-r--r--src/lib/elementary/elm_object_item.h2
-rw-r--r--src/lib/elementary/elm_pan.eo58
-rw-r--r--src/lib/elementary/elm_pan_eo.c76
-rw-r--r--src/lib/elementary/elm_pan_eo.h87
-rw-r--r--src/lib/elementary/elm_pan_eo.legacy.c30
-rw-r--r--src/lib/elementary/elm_pan_eo.legacy.h72
-rw-r--r--src/lib/elementary/elm_panel.c27
-rw-r--r--src/lib/elementary/elm_panel.eo94
-rw-r--r--src/lib/elementary/elm_panel_eo.c210
-rw-r--r--src/lib/elementary/elm_panel_eo.h140
-rw-r--r--src/lib/elementary/elm_panel_eo.legacy.c54
-rw-r--r--src/lib/elementary/elm_panel_eo.legacy.h125
-rw-r--r--src/lib/elementary/elm_panel_legacy.h2
-rw-r--r--src/lib/elementary/elm_panes.h4
-rw-r--r--src/lib/elementary/elm_panes_legacy.h2
-rw-r--r--src/lib/elementary/elm_photo.c86
-rw-r--r--src/lib/elementary/elm_photo.eo15
-rw-r--r--src/lib/elementary/elm_photo_eo.c79
-rw-r--r--src/lib/elementary/elm_photo_eo.h24
-rw-r--r--src/lib/elementary/elm_photo_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_photo_legacy.h2
-rw-r--r--src/lib/elementary/elm_photocam.h3
-rw-r--r--src/lib/elementary/elm_photocam_legacy.h20
-rw-r--r--src/lib/elementary/elm_player.eo28
-rw-r--r--src/lib/elementary/elm_player_eo.c73
-rw-r--r--src/lib/elementary/elm_player_eo.h112
-rw-r--r--src/lib/elementary/elm_player_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_plug.c8
-rw-r--r--src/lib/elementary/elm_plug.eo43
-rw-r--r--src/lib/elementary/elm_plug_eo.c59
-rw-r--r--src/lib/elementary/elm_plug_eo.h73
-rw-r--r--src/lib/elementary/elm_plug_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_plug_eo.legacy.h49
-rw-r--r--src/lib/elementary/elm_plug_legacy.h2
-rw-r--r--src/lib/elementary/elm_popup.eo190
-rw-r--r--src/lib/elementary/elm_popup_eo.c243
-rw-r--r--src/lib/elementary/elm_popup_eo.h288
-rw-r--r--src/lib/elementary/elm_popup_eo.legacy.c84
-rw-r--r--src/lib/elementary/elm_popup_eo.legacy.h239
-rw-r--r--src/lib/elementary/elm_popup_item.eo15
-rw-r--r--src/lib/elementary/elm_popup_item_eo.c67
-rw-r--r--src/lib/elementary/elm_popup_item_eo.h24
-rw-r--r--src/lib/elementary/elm_popup_item_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_prefs.c4
-rw-r--r--src/lib/elementary/elm_prefs.eo227
-rw-r--r--src/lib/elementary/elm_prefs_eo.c159
-rw-r--r--src/lib/elementary/elm_prefs_eo.h381
-rw-r--r--src/lib/elementary/elm_prefs_eo.legacy.c96
-rw-r--r--src/lib/elementary/elm_prefs_eo.legacy.h329
-rw-r--r--src/lib/elementary/elm_prefs_legacy.h2
-rw-r--r--src/lib/elementary/elm_priv.h100
-rw-r--r--src/lib/elementary/elm_progressbar.h3
-rw-r--r--src/lib/elementary/elm_radio.h4
-rw-r--r--src/lib/elementary/elm_radio_legacy.h2
-rw-r--r--src/lib/elementary/elm_route.c8
-rw-r--r--src/lib/elementary/elm_route.eo47
-rw-r--r--src/lib/elementary/elm_route_eo.c56
-rw-r--r--src/lib/elementary/elm_route_eo.h60
-rw-r--r--src/lib/elementary/elm_route_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_route_eo.legacy.h53
-rw-r--r--src/lib/elementary/elm_route_legacy.h2
-rw-r--r--src/lib/elementary/elm_scroller.c18
-rw-r--r--src/lib/elementary/elm_scroller.eo78
-rw-r--r--src/lib/elementary/elm_scroller_eo.c150
-rw-r--r--src/lib/elementary/elm_scroller_eo.h183
-rw-r--r--src/lib/elementary/elm_scroller_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_scroller_eo.legacy.h56
-rw-r--r--src/lib/elementary/elm_scroller_legacy.h2
-rw-r--r--src/lib/elementary/elm_segment_control.c25
-rw-r--r--src/lib/elementary/elm_segment_control.eo147
-rw-r--r--src/lib/elementary/elm_segment_control_eo.c95
-rw-r--r--src/lib/elementary/elm_segment_control_eo.h186
-rw-r--r--src/lib/elementary/elm_segment_control_eo.legacy.c48
-rw-r--r--src/lib/elementary/elm_segment_control_eo.legacy.h170
-rw-r--r--src/lib/elementary/elm_segment_control_item.eo47
-rw-r--r--src/lib/elementary/elm_segment_control_item_eo.c84
-rw-r--r--src/lib/elementary/elm_segment_control_item_eo.h72
-rw-r--r--src/lib/elementary/elm_segment_control_item_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_segment_control_item_eo.legacy.h65
-rw-r--r--src/lib/elementary/elm_segment_control_legacy.h4
-rw-r--r--src/lib/elementary/elm_separator.c10
-rw-r--r--src/lib/elementary/elm_separator.eo24
-rw-r--r--src/lib/elementary/elm_separator_eo.c83
-rw-r--r--src/lib/elementary/elm_separator_eo.h45
-rw-r--r--src/lib/elementary/elm_separator_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_separator_eo.legacy.h38
-rw-r--r--src/lib/elementary/elm_separator_legacy.h2
-rw-r--r--src/lib/elementary/elm_slider.c20
-rw-r--r--src/lib/elementary/elm_slider.eo25
-rw-r--r--src/lib/elementary/elm_slider.h4
-rw-r--r--src/lib/elementary/elm_slider_eo.c87
-rw-r--r--src/lib/elementary/elm_slider_eo.h24
-rw-r--r--src/lib/elementary/elm_slider_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_slider_part_indicator.eo20
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.c53
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.h45
-rw-r--r--src/lib/elementary/elm_slider_part_indicator_eo.legacy.h19
-rw-r--r--src/lib/elementary/elm_slideshow.c8
-rw-r--r--src/lib/elementary/elm_slideshow.eo316
-rw-r--r--src/lib/elementary/elm_slideshow_eo.c321
-rw-r--r--src/lib/elementary/elm_slideshow_eo.h408
-rw-r--r--src/lib/elementary/elm_slideshow_eo.legacy.c138
-rw-r--r--src/lib/elementary/elm_slideshow_eo.legacy.h382
-rw-r--r--src/lib/elementary/elm_slideshow_item.eo36
-rw-r--r--src/lib/elementary/elm_slideshow_item_eo.c51
-rw-r--r--src/lib/elementary/elm_slideshow_item_eo.h57
-rw-r--r--src/lib/elementary/elm_slideshow_item_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_slideshow_item_eo.legacy.h50
-rw-r--r--src/lib/elementary/elm_slideshow_legacy.h4
-rw-r--r--src/lib/elementary/elm_spinner.c16
-rw-r--r--src/lib/elementary/elm_spinner.eo195
-rw-r--r--src/lib/elementary/elm_spinner.h3
-rw-r--r--src/lib/elementary/elm_spinner_eo.c335
-rw-r--r--src/lib/elementary/elm_spinner_eo.h350
-rw-r--r--src/lib/elementary/elm_spinner_eo.legacy.c78
-rw-r--r--src/lib/elementary/elm_spinner_eo.legacy.h295
-rw-r--r--src/lib/elementary/elm_spinner_legacy.h2
-rw-r--r--src/lib/elementary/elm_store.c2
-rw-r--r--src/lib/elementary/elm_sys_notify.c10
-rw-r--r--src/lib/elementary/elm_sys_notify.eo96
-rw-r--r--src/lib/elementary/elm_sys_notify.h4
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.c10
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus.eo15
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus_eo.c51
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus_eo.h24
-rw-r--r--src/lib/elementary/elm_sys_notify_dbus_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_sys_notify_eo.c76
-rw-r--r--src/lib/elementary/elm_sys_notify_eo.h124
-rw-r--r--src/lib/elementary/elm_sys_notify_eo.legacy.c12
-rw-r--r--src/lib/elementary/elm_sys_notify_eo.legacy.h117
-rw-r--r--src/lib/elementary/elm_sys_notify_interface.c2
-rw-r--r--src/lib/elementary/elm_sys_notify_interface.eo68
-rw-r--r--src/lib/elementary/elm_sys_notify_interface_eo.c39
-rw-r--r--src/lib/elementary/elm_sys_notify_interface_eo.h91
-rw-r--r--src/lib/elementary/elm_sys_notify_interface_eo.legacy.c18
-rw-r--r--src/lib/elementary/elm_sys_notify_interface_eo.legacy.h84
-rw-r--r--src/lib/elementary/elm_systray.c4
-rw-r--r--src/lib/elementary/elm_systray.eo125
-rw-r--r--src/lib/elementary/elm_systray.h2
-rw-r--r--src/lib/elementary/elm_systray_eo.c250
-rw-r--r--src/lib/elementary/elm_systray_eo.h236
-rw-r--r--src/lib/elementary/elm_systray_eo.legacy.c102
-rw-r--r--src/lib/elementary/elm_systray_eo.legacy.h229
-rw-r--r--src/lib/elementary/elm_table.c10
-rw-r--r--src/lib/elementary/elm_table.eo128
-rw-r--r--src/lib/elementary/elm_table_eo.c145
-rw-r--r--src/lib/elementary/elm_table_eo.h185
-rw-r--r--src/lib/elementary/elm_table_eo.legacy.c60
-rw-r--r--src/lib/elementary/elm_table_eo.legacy.h146
-rw-r--r--src/lib/elementary/elm_table_legacy.h2
-rw-r--r--src/lib/elementary/elm_textpath.h4
-rw-r--r--src/lib/elementary/elm_textpath_legacy.h2
-rw-r--r--src/lib/elementary/elm_theme.c19
-rw-r--r--src/lib/elementary/elm_thumb.c104
-rw-r--r--src/lib/elementary/elm_thumb.eo22
-rw-r--r--src/lib/elementary/elm_thumb_eo.c85
-rw-r--r--src/lib/elementary/elm_thumb_eo.h64
-rw-r--r--src/lib/elementary/elm_thumb_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_thumb_legacy.h2
-rw-r--r--src/lib/elementary/elm_toolbar.c35
-rw-r--r--src/lib/elementary/elm_toolbar.eo379
-rw-r--r--src/lib/elementary/elm_toolbar.h3
-rw-r--r--src/lib/elementary/elm_toolbar_eo.c377
-rw-r--r--src/lib/elementary/elm_toolbar_eo.h546
-rw-r--r--src/lib/elementary/elm_toolbar_eo.legacy.c150
-rw-r--r--src/lib/elementary/elm_toolbar_eo.legacy.h525
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo329
-rw-r--r--src/lib/elementary/elm_toolbar_item_eo.c328
-rw-r--r--src/lib/elementary/elm_toolbar_item_eo.h410
-rw-r--r--src/lib/elementary/elm_toolbar_item_eo.legacy.c144
-rw-r--r--src/lib/elementary/elm_toolbar_item_eo.legacy.h401
-rw-r--r--src/lib/elementary/elm_toolbar_legacy.h4
-rw-r--r--src/lib/elementary/elm_view_form.c8
-rw-r--r--src/lib/elementary/elm_view_form.eo31
-rw-r--r--src/lib/elementary/elm_view_form.h2
-rw-r--r--src/lib/elementary/elm_view_form_eo.c45
-rw-r--r--src/lib/elementary/elm_view_form_eo.h49
-rw-r--r--src/lib/elementary/elm_view_form_eo.legacy.h19
-rw-r--r--src/lib/elementary/elm_view_list.c7
-rw-r--r--src/lib/elementary/elm_view_list.eo65
-rw-r--r--src/lib/elementary/elm_view_list.h2
-rw-r--r--src/lib/elementary/elm_view_list_eo.c62
-rw-r--r--src/lib/elementary/elm_view_list_eo.h97
-rw-r--r--src/lib/elementary/elm_view_list_eo.legacy.h22
-rw-r--r--src/lib/elementary/elm_web.eo450
-rw-r--r--src/lib/elementary/elm_web.h9
-rw-r--r--src/lib/elementary/elm_web2.c2
-rw-r--r--src/lib/elementary/elm_web_eo.c293
-rw-r--r--src/lib/elementary/elm_web_eo.h603
-rw-r--r--src/lib/elementary/elm_web_eo.legacy.c246
-rw-r--r--src/lib/elementary/elm_web_eo.legacy.h594
-rw-r--r--src/lib/elementary/elm_web_legacy.h2
-rw-r--r--src/lib/elementary/elm_widget.h17
-rw-r--r--src/lib/elementary/elm_widget_clock.h2
-rw-r--r--src/lib/elementary/elm_widget_colorselector.h4
-rw-r--r--src/lib/elementary/elm_widget_dayselector.h4
-rw-r--r--src/lib/elementary/elm_widget_entry.h2
-rw-r--r--src/lib/elementary/elm_widget_gengrid.h2
-rw-r--r--src/lib/elementary/elm_widget_glview.h2
-rw-r--r--src/lib/elementary/elm_widget_hover.h2
-rw-r--r--src/lib/elementary/elm_widget_index.h4
-rw-r--r--src/lib/elementary/elm_widget_item.eo547
-rw-r--r--src/lib/elementary/elm_widget_item_container_eo.c33
-rw-r--r--src/lib/elementary/elm_widget_item_container_eo.h31
-rw-r--r--src/lib/elementary/elm_widget_item_container_eo.legacy.h18
-rw-r--r--src/lib/elementary/elm_widget_item_eo.c558
-rw-r--r--src/lib/elementary/elm_widget_item_eo.h883
-rw-r--r--src/lib/elementary/elm_widget_item_eo.legacy.c282
-rw-r--r--src/lib/elementary/elm_widget_item_eo.legacy.h799
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus.c6
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus.eo9
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus_eo.c43
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus_eo.h26
-rw-r--r--src/lib/elementary/elm_widget_item_static_focus_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_widget_label.h2
-rw-r--r--src/lib/elementary/elm_widget_layout.h5
-rw-r--r--src/lib/elementary/elm_widget_list.h4
-rw-r--r--src/lib/elementary/elm_widget_menu.h6
-rw-r--r--src/lib/elementary/elm_widget_notify.h2
-rw-r--r--src/lib/elementary/elm_widget_panel.h2
-rw-r--r--src/lib/elementary/elm_widget_player.h2
-rw-r--r--src/lib/elementary/elm_widget_plug.h2
-rw-r--r--src/lib/elementary/elm_widget_popup.h6
-rw-r--r--src/lib/elementary/elm_widget_route.h2
-rw-r--r--src/lib/elementary/elm_widget_thumb.h1
-rw-r--r--src/lib/elementary/elm_win.h6
-rw-r--r--src/lib/elementary/elm_win_eo.h8
-rw-r--r--src/lib/elementary/elm_win_legacy.h852
-rw-r--r--src/lib/elementary/els_cursor.c12
-rw-r--r--src/lib/elementary/els_tooltip.c4
-rw-r--r--src/lib/elementary/elu_ews_wm.c2
-rw-r--r--src/lib/elementary/meson.build222
805 files changed, 63091 insertions, 16917 deletions
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 515ee48c06..d5db6923d0 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -8,6 +8,10 @@
8# define EFL_EO_API_SUPPORT 8# define EFL_EO_API_SUPPORT
9#endif 9#endif
10 10
11/* FIXME: wtf? */
12#ifndef EFL_UI_RADIO_EVENT_CHANGED
13# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
14#endif
11/* Standard headers for standard system calls etc. */ 15/* Standard headers for standard system calls etc. */
12#include <stdio.h> 16#include <stdio.h>
13#include <stdlib.h> 17#include <stdlib.h>
@@ -170,7 +174,10 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
170 174
171# include <efl_ui_theme.eo.h> 175# include <efl_ui_theme.eo.h>
172# include <efl_config_global.eo.h> 176# include <efl_config_global.eo.h>
177# include <efl_ui_widget.eo.h>
178# include <efl_ui_widget_common.h>
173# include <efl_ui_widget_part.eo.h> 179# include <efl_ui_widget_part.eo.h>
180# include <efl_ui_layout_base.eo.h>
174# include <efl_ui_layout.eo.h> 181# include <efl_ui_layout.eo.h>
175# include <efl_ui_layout_part.eo.h> 182# include <efl_ui_layout_part.eo.h>
176# include <efl_ui_layout_part_box.eo.h> 183# include <efl_ui_layout_part_box.eo.h>
@@ -186,12 +193,15 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
186# include <efl_ui_table_static.eo.h> 193# include <efl_ui_table_static.eo.h>
187# include <efl_ui_image.eo.h> 194# include <efl_ui_image.eo.h>
188# include <efl_ui_win.eo.h> 195# include <efl_ui_win.eo.h>
196/* FIXME: what the actual fuck. */
197# include <elm_win_eo.h>
189# include <efl_ui_win_inlined.eo.h> 198# include <efl_ui_win_inlined.eo.h>
190# include <efl_ui_win_socket.eo.h> 199# include <efl_ui_win_socket.eo.h>
191# include <efl_ui_relative_layout.eo.h> 200# include <efl_ui_relative_layout.eo.h>
192 201
193/* FIXME: Efl.Ui.Text must not use elm_general.h */ 202/* FIXME: Efl.Ui.Text must not use elm_general.h */
194# warning Efl.Ui.Text is not available yet without Elementary.h 203// no.
204//# warning Efl.Ui.Text is not available yet without Elementary.h
195# if 0 205# if 0
196# include <efl_ui_text_interactive.eo.h> 206# include <efl_ui_text_interactive.eo.h>
197# include <efl_ui_text.eo.h> 207# include <efl_ui_text.eo.h>
@@ -220,6 +230,7 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
220# include <efl_ui_progressbar_eo.h> 230# include <efl_ui_progressbar_eo.h>
221# include <efl_ui_radio_eo.h> 231# include <efl_ui_radio_eo.h>
222# include <efl_ui_panes_eo.h> 232# include <efl_ui_panes_eo.h>
233# include <efl_ui_panes_part.eo.h>
223 234
224/** 235/**
225 * Initialize Elementary 236 * Initialize Elementary
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index b7a67927e2..e4784eca57 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -148,7 +148,11 @@ EAPI extern Elm_Version *elm_version;
148#include <elm_focus.h> 148#include <elm_focus.h>
149 149
150#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT) 150#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
151 151/* FIXME: wtf? */
152#ifndef EFL_UI_RADIO_EVENT_CHANGED
153# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
154#endif
155# include <efl_ui.eot.h>
152//define focus manager earlier since focus object and manager is circular 156//define focus manager earlier since focus object and manager is circular
153typedef Eo Efl_Ui_Focus_Manager; 157typedef Eo Efl_Ui_Focus_Manager;
154#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE 158#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE
@@ -167,7 +171,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
167# include <efl_ui_focus_layer.eo.h> 171# include <efl_ui_focus_layer.eo.h>
168# include <elm_interface_scrollable.h> 172# include <elm_interface_scrollable.h>
169# include <elm_interface_scrollable.eo.h> 173# include <elm_interface_scrollable.eo.h>
170# include <elm_spinner.eo.h>
171#endif 174#endif
172 175
173#include <elm_tooltip.h> 176#include <elm_tooltip.h>
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index 26ebcca586..4f54020558 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -118,7 +118,6 @@ enum Efl.Access.Role
118enum Efl.Access.State_Type 118enum Efl.Access.State_Type
119{ 119{
120 [[Describes the possible states for an object visible to accessibility clients.]] 120 [[Describes the possible states for an object visible to accessibility clients.]]
121 legacy: efl_access_state;
122 invalid, [[State: invalid]] 121 invalid, [[State: invalid]]
123 active, [[State: active]] 122 active, [[State: active]]
124 armed, [[State: armed]] 123 armed, [[State: armed]]
@@ -134,7 +133,7 @@ enum Efl.Access.State_Type
134 focused, [[State: focused]] 133 focused, [[State: focused]]
135 has_tooltip, [[State: has a tooltip]] 134 has_tooltip, [[State: has a tooltip]]
136 horizontal, [[State: horizontal]] 135 horizontal, [[State: horizontal]]
137 iconified, [[State: iconified]] 136 minimized, [[State: minimized]]
138 modal, [[State: modal]] 137 modal, [[State: modal]]
139 multi_line, [[State: multi line]] 138 multi_line, [[State: multi line]]
140 multiselectable, [[State: multiselectable]] 139 multiselectable, [[State: multiselectable]]
@@ -166,7 +165,6 @@ enum Efl.Access.State_Type
166enum Efl.Access.Relation_Type 165enum Efl.Access.Relation_Type
167{ 166{
168 [[Describes the relationship between two objects.]] 167 [[Describes the relationship between two objects.]]
169 legacy: efl_access_relation;
170 null, [[No relation]] 168 null, [[No relation]]
171 label_for, [[Label for relation]] 169 label_for, [[Label for relation]]
172 labelled_by, [[Labelled by relation]] 170 labelled_by, [[Labelled by relation]]
@@ -413,8 +411,8 @@ mixin @beta Efl.Access.Object requires Efl.Object
413 provide customized feedback, improving overall user experience. 411 provide customized feedback, improving overall user experience.
414 412
415 Relationship_append API is asymmetric, which means that 413 Relationship_append API is asymmetric, which means that
416 appending, for example, relation EFL_ACCESS_RELATION_FLOWS_TO from object A to B, 414 appending, for example, relation EFL_ACCESS_RELATION_TYPE_FLOWS_TO from object A to B,
417 do NOT append relation EFL_ACCESS_RELATION_FLOWS_FROM from object B to 415 do NOT append relation EFL_ACCESS_RELATION_TYPE_FLOWS_FROM from object B to
418 object A.]] 416 object A.]]
419 return: bool; [[$true if relationship was successfully appended, $false otherwise]] 417 return: bool; [[$true if relationship was successfully appended, $false otherwise]]
420 params { 418 params {
diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo
index d49e0d372b..d16874fb2f 100644
--- a/src/lib/elementary/efl_access_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -13,7 +13,6 @@ enum Efl.Access.Text_Granularity
13enum Efl.Access.Text_Clip_Type 13enum Efl.Access.Text_Clip_Type
14{ 14{
15 [[Text clip type]] 15 [[Text clip type]]
16 legacy: elm_atspi_text_clip;
17 none, [[No clip type]] 16 none, [[No clip type]]
18 min, [[Minimum clip type]] 17 min, [[Minimum clip type]]
19 max, [[Maximum clip type]] 18 max, [[Maximum clip type]]
diff --git a/src/lib/elementary/efl_page_transition_scroll.c b/src/lib/elementary/efl_page_transition_scroll.c
index 34209aea63..4979206153 100644
--- a/src/lib/elementary/efl_page_transition_scroll.c
+++ b/src/lib/elementary/efl_page_transition_scroll.c
@@ -116,10 +116,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
116 { 116 {
117 if (curr->visible) 117 if (curr->visible)
118 { 118 {
119 efl_canvas_object_clip_set(curr->obj, pd->backclip); 119 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
120 120
121 efl_pack_unpack(curr->obj, curr->content); 121 efl_pack_unpack(curr->obj, curr->content);
122 efl_canvas_object_clip_set(curr->content, pd->backclip); 122 efl_canvas_object_clipper_set(curr->content, pd->backclip);
123 123
124 curr->content_num = -1; 124 curr->content_num = -1;
125 curr->content = NULL; 125 curr->content = NULL;
@@ -140,10 +140,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
140 { 140 {
141 tmp = efl_pack_content_get(spd->pager.obj, tmp_id); 141 tmp = efl_pack_content_get(spd->pager.obj, tmp_id);
142 142
143 efl_canvas_object_clip_set(curr->obj, pd->foreclip); 143 efl_canvas_object_clipper_set(curr->obj, pd->foreclip);
144 144
145 efl_pack(curr->obj, tmp); 145 efl_pack(curr->obj, tmp);
146 efl_canvas_object_clip_set(tmp, pd->foreclip); 146 efl_canvas_object_clipper_set(tmp, pd->foreclip);
147 147
148 curr->content_num = tmp_id; 148 curr->content_num = tmp_id;
149 curr->content = tmp; 149 curr->content = tmp;
@@ -152,10 +152,10 @@ _page_info_geometry_change(Efl_Page_Transition_Scroll_Data *pd,
152 } 152 }
153 else if (curr->content) 153 else if (curr->content)
154 { 154 {
155 efl_canvas_object_clip_set(curr->obj, pd->backclip); 155 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
156 156
157 efl_pack_unpack(curr->obj, curr->content); 157 efl_pack_unpack(curr->obj, curr->content);
158 efl_canvas_object_clip_set(curr->content, pd->backclip); 158 efl_canvas_object_clipper_set(curr->content, pd->backclip);
159 159
160 curr->content_num = -1; 160 curr->content_num = -1;
161 curr->content = NULL; 161 curr->content = NULL;
@@ -249,7 +249,7 @@ _efl_page_transition_scroll_efl_page_transition_bind(Eo *obj,
249 for (i = 0; i < cnt; i++) 249 for (i = 0; i < cnt; i++)
250 { 250 {
251 item = efl_pack_content_get(spd->pager.obj, i); 251 item = efl_pack_content_get(spd->pager.obj, i);
252 efl_canvas_object_clip_set(item, pd->backclip); 252 efl_canvas_object_clipper_set(item, pd->backclip);
253 } 253 }
254 _page_info_allocate(pd, spd); 254 _page_info_allocate(pd, spd);
255 _page_info_geometry_change(pd, spd); 255 _page_info_geometry_change(pd, spd);
@@ -314,9 +314,9 @@ _efl_page_transition_scroll_update(Eo *obj,
314 314
315 if (dummy->visible) 315 if (dummy->visible)
316 { 316 {
317 efl_canvas_object_clip_set(dummy->obj, pd->backclip); 317 efl_canvas_object_clipper_set(dummy->obj, pd->backclip);
318 efl_pack_unpack(dummy->obj, dummy->content); 318 efl_pack_unpack(dummy->obj, dummy->content);
319 efl_canvas_object_clip_set(dummy->content, pd->backclip); 319 efl_canvas_object_clipper_set(dummy->content, pd->backclip);
320 320
321 dummy->content_num = -1; 321 dummy->content_num = -1;
322 dummy->content = NULL; 322 dummy->content = NULL;
@@ -340,10 +340,10 @@ _efl_page_transition_scroll_update(Eo *obj,
340 { 340 {
341 if (curr->visible) 341 if (curr->visible)
342 { 342 {
343 efl_canvas_object_clip_set(curr->obj, pd->backclip); 343 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
344 344
345 efl_pack_unpack(curr->obj, curr->content); 345 efl_pack_unpack(curr->obj, curr->content);
346 efl_canvas_object_clip_set(curr->content, pd->backclip); 346 efl_canvas_object_clipper_set(curr->content, pd->backclip);
347 347
348 curr->content_num = -1; 348 curr->content_num = -1;
349 curr->content = NULL; 349 curr->content = NULL;
@@ -367,13 +367,13 @@ _efl_page_transition_scroll_update(Eo *obj,
367 if (curr->content) 367 if (curr->content)
368 { 368 {
369 efl_pack_unpack(curr->obj, curr->content); 369 efl_pack_unpack(curr->obj, curr->content);
370 efl_canvas_object_clip_set(curr->content, pd->backclip); 370 efl_canvas_object_clipper_set(curr->content, pd->backclip);
371 } 371 }
372 372
373 efl_canvas_object_clip_set(curr->obj, pd->foreclip); 373 efl_canvas_object_clipper_set(curr->obj, pd->foreclip);
374 374
375 efl_pack(curr->obj, tmp); 375 efl_pack(curr->obj, tmp);
376 efl_canvas_object_clip_set(tmp, pd->foreclip); 376 efl_canvas_object_clipper_set(tmp, pd->foreclip);
377 377
378 curr->content_num = tmp_id; 378 curr->content_num = tmp_id;
379 curr->content = tmp; 379 curr->content = tmp;
@@ -382,10 +382,10 @@ _efl_page_transition_scroll_update(Eo *obj,
382 } 382 }
383 else if (curr->content) 383 else if (curr->content)
384 { 384 {
385 efl_canvas_object_clip_set(curr->obj, pd->backclip); 385 efl_canvas_object_clipper_set(curr->obj, pd->backclip);
386 386
387 efl_pack_unpack(curr->obj, curr->content); 387 efl_pack_unpack(curr->obj, curr->content);
388 efl_canvas_object_clip_set(curr->content, pd->backclip); 388 efl_canvas_object_clipper_set(curr->content, pd->backclip);
389 389
390 curr->content_num = -1; 390 curr->content_num = -1;
391 curr->content = NULL; 391 curr->content = NULL;
@@ -480,7 +480,7 @@ _add_item(Efl_Page_Transition_Scroll_Data *pd, Efl_Page_Transition_Data *spd)
480static void 480static void
481_remove_item(Page_Info *pi, Efl_Page_Transition_Scroll_Data *pd) 481_remove_item(Page_Info *pi, Efl_Page_Transition_Scroll_Data *pd)
482{ 482{
483 efl_canvas_object_clip_set(pi->content, pd->backclip); 483 efl_canvas_object_clipper_set(pi->content, pd->backclip);
484 efl_pack_unpack(pi->obj, pi->content); 484 efl_pack_unpack(pi->obj, pi->content);
485 efl_del(pi->obj); 485 efl_del(pi->obj);
486 pi->prev->next = pi->next; 486 pi->prev->next = pi->next;
@@ -583,7 +583,7 @@ _efl_page_transition_scroll_loop_set(Eo *obj,
583 tmp = efl_pack_content_get(spd->pager.obj, tmp_id); 583 tmp = efl_pack_content_get(spd->pager.obj, tmp_id);
584 584
585 efl_pack(curr->obj, tmp); 585 efl_pack(curr->obj, tmp);
586 efl_canvas_object_clip_set(tmp, pd->foreclip); 586 efl_canvas_object_clipper_set(tmp, pd->foreclip);
587 587
588 curr->content_num = tmp_id; 588 curr->content_num = tmp_id;
589 curr->content = tmp; 589 curr->content = tmp;
@@ -593,7 +593,7 @@ _efl_page_transition_scroll_loop_set(Eo *obj,
593 593
594 case EFL_UI_PAGER_LOOP_DISABLED: 594 case EFL_UI_PAGER_LOOP_DISABLED:
595 efl_pack_unpack(curr->obj, curr->content); 595 efl_pack_unpack(curr->obj, curr->content);
596 efl_canvas_object_clip_set(curr->content, pd->backclip); 596 efl_canvas_object_clipper_set(curr->content, pd->backclip);
597 597
598 curr->content_num = -1; 598 curr->content_num = -1;
599 curr->content = NULL; 599 curr->content = NULL;
diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot
index ce17980e56..bc9c2bcce7 100644
--- a/src/lib/elementary/efl_ui.eot
+++ b/src/lib/elementary/efl_ui.eot
@@ -1,15 +1,11 @@
1/* Efl.Ui enum and struct types */ 1/* Efl.Ui enum and struct types */
2import eina_types;
2 3
3enum Efl.Ui.Theme_Apply_Result 4var Efl.Ui.Theme.Apply_Error.NONE: Eina.Error; [[Successfully applied the requested style from the current theme.]]
4{ 5var Efl.Ui.Theme.Apply_Error.DEFAULT: Eina.Error; [[Successfully applied the default style. The widget may
5 [[Return error code when setting the style on a widget.]] 6 look different from the rest of the UI if a custom theme
6 fail = 0, [[Failed to apply theme. The widget may become unusable.]] 7 is in use, but it should be usable.]]
7 default = 1, [[Successfully applied the default style. The widget may 8var Efl.Ui.Theme.Apply_Error.GENERIC: Eina.Error; [[Failed to apply theme. The widget may become unusable.]]
8 look different from the rest of the UI if a custom theme
9 is in use, but it should be usable.]]
10 success = 3 [[Successfully applied the requested style from the current
11 theme.]]
12}
13 9
14enum Efl.Ui.Focus.Direction 10enum Efl.Ui.Focus.Direction
15{ 11{
@@ -23,13 +19,6 @@ enum Efl.Ui.Focus.Direction
23 last = 6 [[ last direction ]] 19 last = 6 [[ last direction ]]
24} 20}
25 21
26enum Efl.Ui.Interest_Region_Mode
27{
28 [[Focus region show mode.]]
29 widget, [[As a widget.]]
30 item, [[As an item.]]
31}
32
33enum Efl.Ui.Focus.Move_Policy 22enum Efl.Ui.Focus.Move_Policy
34{ 23{
35 [[Focus Movement Policy. 24 [[Focus Movement Policy.
diff --git a/src/lib/elementary/efl_ui_animation_view.c b/src/lib/elementary/efl_ui_animation_view.c
index 6a60e1af22..4f3ec3b23c 100644
--- a/src/lib/elementary/efl_ui_animation_view.c
+++ b/src/lib/elementary/efl_ui_animation_view.c
@@ -42,7 +42,7 @@ static void
42_sizing_eval(void *data) 42_sizing_eval(void *data)
43{ 43{
44 Efl_Ui_Animation_View_Data *pd = data; 44 Efl_Ui_Animation_View_Data *pd = data;
45 if (!pd->file) return; 45 if (!efl_file_loaded_get(pd->obj)) return;
46 46
47 double hw,hh; 47 double hw,hh;
48 efl_gfx_hint_weight_get(pd->obj, &hw, &hh); 48 efl_gfx_hint_weight_get(pd->obj, &hw, &hh);
@@ -208,7 +208,6 @@ _efl_ui_animation_view_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Animation_View
208EOLIAN static void 208EOLIAN static void
209_efl_ui_animation_view_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Animation_View_Data *pd EINA_UNUSED) 209_efl_ui_animation_view_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Animation_View_Data *pd EINA_UNUSED)
210{ 210{
211 if (pd->file) eina_stringshare_del(pd->file);
212 if (pd->transit) 211 if (pd->transit)
213 { 212 {
214 pd->transit = NULL; //Skip perform transit_del_cb() 213 pd->transit = NULL; //Skip perform transit_del_cb()
@@ -280,26 +279,35 @@ _ready_play(Efl_Ui_Animation_View_Data *pd)
280 return EINA_FALSE; 279 return EINA_FALSE;
281} 280}
282 281
283EOLIAN static Eina_Bool 282EOLIAN static void
284_efl_ui_animation_view_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *pd, const char *file, const char *key) 283_efl_ui_animation_view_efl_file_unload(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *pd)
284{
285 pd->state = EFL_UI_ANIMATION_VIEW_STATE_NOT_READY;
286 pd->frame_cnt = 0;
287 pd->frame_duration = 0;
288 if (pd->transit) elm_transit_del(pd->transit);
289}
290
291EOLIAN static Eina_Error
292_efl_ui_animation_view_efl_file_load(Eo *obj, Efl_Ui_Animation_View_Data *pd)
285{ 293{
286 if (!evas_object_vg_file_set(pd->vg, file, key)) return EINA_FALSE; 294 Eina_Error err;
295 const Eina_File *file;
296 const char *key;
297
298 if (efl_file_loaded_get(obj)) return 0;
299
300 err = efl_file_load(efl_super(obj, MY_CLASS));
301 if (err) return err;
302
303 file = efl_file_mmap_get(obj);
304 key = efl_file_key_get(obj);
305 efl_file_simple_mmap_load(pd->vg, file, key);
287 306
288 if (pd->file) eina_stringshare_del(pd->file);
289 pd->file = eina_stringshare_add(file);
290 pd->progress = 0; 307 pd->progress = 0;
291 308
292 _sizing_eval(pd); 309 _sizing_eval(pd);
293 310
294 if (!pd->file)
295 {
296 pd->state = EFL_UI_ANIMATION_VIEW_STATE_NOT_READY;
297 pd->frame_cnt = 0;
298 pd->frame_duration = 0;
299 if (pd->transit) elm_transit_del(pd->transit);
300 return EINA_FALSE;
301 }
302
303 if (!_ready_play(pd)) return EINA_TRUE; 311 if (!_ready_play(pd)) return EINA_TRUE;
304 312
305 if (pd->auto_play) 313 if (pd->auto_play)
@@ -391,7 +399,7 @@ _efl_ui_animation_view_auto_play_get(const Eo *obj EINA_UNUSED, Efl_Ui_Animation
391} 399}
392 400
393EOLIAN static Eina_Bool 401EOLIAN static Eina_Bool
394_efl_ui_animation_view_play(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *pd) 402_efl_ui_animation_view_play(Eo *obj, Efl_Ui_Animation_View_Data *pd)
395{ 403{
396 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_PLAY) return EINA_FALSE; 404 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_PLAY) return EINA_FALSE;
397 405
@@ -401,7 +409,7 @@ _efl_ui_animation_view_play(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *pd)
401 pd->play_back = EINA_FALSE; 409 pd->play_back = EINA_FALSE;
402 pd->auto_play_pause = EINA_FALSE; 410 pd->auto_play_pause = EINA_FALSE;
403 411
404 if (!pd->file) return EINA_FALSE; 412 if (!efl_file_loaded_get(obj)) return EINA_FALSE;
405 if (!pd->transit && !_ready_play(pd)) return EINA_FALSE; 413 if (!pd->transit && !_ready_play(pd)) return EINA_FALSE;
406 414
407 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_STOP) 415 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_STOP)
@@ -471,7 +479,7 @@ _efl_ui_animation_view_resume(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *p
471} 479}
472 480
473EOLIAN static Eina_Bool 481EOLIAN static Eina_Bool
474_efl_ui_animation_view_play_back(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data *pd) 482_efl_ui_animation_view_play_back(Eo *obj, Efl_Ui_Animation_View_Data *pd)
475{ 483{
476 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_PLAY_BACK) return EINA_FALSE; 484 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_PLAY_BACK) return EINA_FALSE;
477 485
@@ -481,7 +489,7 @@ _efl_ui_animation_view_play_back(Eo *obj EINA_UNUSED, Efl_Ui_Animation_View_Data
481 pd->play_back = EINA_TRUE; 489 pd->play_back = EINA_TRUE;
482 pd->auto_play_pause = EINA_FALSE; 490 pd->auto_play_pause = EINA_FALSE;
483 491
484 if (!pd->file) return EINA_FALSE; 492 if (!efl_file_loaded_get(obj)) return EINA_FALSE;
485 if (!pd->transit && !_ready_play(pd)) return EINA_FALSE; 493 if (!pd->transit && !_ready_play(pd)) return EINA_FALSE;
486 494
487 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_STOP) 495 if (pd->state == EFL_UI_ANIMATION_VIEW_STATE_STOP)
@@ -662,7 +670,7 @@ elm_animation_view_add(Evas_Object *parent)
662EAPI Eina_Bool 670EAPI Eina_Bool
663elm_animation_view_file_set(Elm_Animation_View *obj, const char *file, const char *key) 671elm_animation_view_file_set(Elm_Animation_View *obj, const char *file, const char *key)
664{ 672{
665 return efl_file_set(obj, file, key); 673 return efl_file_simple_load(obj, file, key);
666} 674}
667 675
668EAPI Elm_Animation_View_State 676EAPI Elm_Animation_View_State
diff --git a/src/lib/elementary/efl_ui_animation_view.eo b/src/lib/elementary/efl_ui_animation_view.eo
index 13ba56006f..97c8f31cda 100644
--- a/src/lib/elementary/efl_ui_animation_view.eo
+++ b/src/lib/elementary/efl_ui_animation_view.eo
@@ -10,7 +10,7 @@ enum Efl.Ui.Animation_View.State
10 stop [[Animation view successfully loaded a file then readied for playing. Otherwise after finished animation or stopped forcely by request. see @Efl.Ui.Animation_View.stop @since 1.22]] 10 stop [[Animation view successfully loaded a file then readied for playing. Otherwise after finished animation or stopped forcely by request. see @Efl.Ui.Animation_View.stop @since 1.22]]
11} 11}
12 12
13class Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.File 13class @beta Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.File
14{ 14{
15 [[Elementary Animation View class]] 15 [[Elementary Animation View class]]
16 legacy_prefix: elm_animation_view; 16 legacy_prefix: elm_animation_view;
@@ -257,7 +257,8 @@ class Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.F
257 implements { 257 implements {
258 Efl.Object.constructor; 258 Efl.Object.constructor;
259 Efl.Object.destructor; 259 Efl.Object.destructor;
260 Efl.File.file { set; } 260 Efl.File.load;
261 Efl.File.unload;
261 Efl.Gfx.Entity.visible { set; } 262 Efl.Gfx.Entity.visible { set; }
262 Efl.Gfx.Entity.position { set; } 263 Efl.Gfx.Entity.position { set; }
263 Efl.Gfx.Entity.size { set; } 264 Efl.Gfx.Entity.size { set; }
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 90bb5061eb..aea33a086a 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -32,10 +32,10 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
32 elm_widget_sub_object_parent_add(obj); 32 elm_widget_sub_object_parent_add(obj);
33 elm_widget_can_focus_set(obj, EINA_FALSE); 33 elm_widget_can_focus_set(obj, EINA_FALSE);
34 34
35 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 35 if (elm_widget_theme_object_set(obj, wd->resize_obj,
36 elm_widget_theme_klass_get(obj), 36 elm_widget_theme_klass_get(obj),
37 elm_widget_theme_element_get(obj), 37 elm_widget_theme_element_get(obj),
38 elm_widget_theme_style_get(obj))) 38 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
39 CRI("Failed to set layout!"); 39 CRI("Failed to set layout!");
40 40
41 if (elm_widget_is_legacy(obj)) 41 if (elm_widget_is_legacy(obj))
@@ -210,48 +210,76 @@ _efl_ui_bg_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNUSED
210EAPI Eina_Bool 210EAPI Eina_Bool
211elm_bg_file_set(Eo *obj, const char *file, const char *group) 211elm_bg_file_set(Eo *obj, const char *file, const char *group)
212{ 212{
213 return efl_file_set((Eo *) obj, file, group); 213 return efl_file_simple_load((Eo *) obj, file, group);
214} 214}
215 215
216EOLIAN static Eina_Bool 216EOLIAN static Eina_Error
217_efl_ui_bg_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, const char *file, const char *key) 217_efl_ui_bg_efl_file_load(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd)
218{
219 return efl_file_load(sd->img);
220}
221
222EOLIAN static Eina_Error
223_efl_ui_bg_efl_file_file_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, const char *file)
218{ 224{
219 eina_stringshare_replace(&sd->file, file); 225 eina_stringshare_replace(&sd->file, file);
226
227 return efl_file_set(sd->img, file);
228}
229
230EOLIAN static void
231_efl_ui_bg_efl_file_key_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, const char *key)
232{
220 eina_stringshare_replace(&sd->key, key); 233 eina_stringshare_replace(&sd->key, key);
221 234
222 return efl_file_set(sd->img, file, key); 235 efl_file_key_set(sd->img, key);
223} 236}
237
224EAPI void 238EAPI void
225elm_bg_file_get(const Eo *obj, const char **file, const char **group) 239elm_bg_file_get(const Eo *obj, const char **file, const char **group)
226{ 240{
227 efl_file_get((Eo *) obj, file, group); 241 efl_file_simple_get((Eo *) obj, file, group);
228} 242}
229 243
230EOLIAN static void 244EOLIAN static const char *
231_efl_ui_bg_efl_file_file_get(const Eo *obj, Efl_Ui_Bg_Data *sd, const char **file, const char **key) 245_efl_ui_bg_efl_file_file_get(const Eo *obj, Efl_Ui_Bg_Data *sd)
232{ 246{
233 if (elm_widget_is_legacy(obj)) 247 if (elm_widget_is_legacy(obj))
234 { 248 return sd->file;
235 if (file) *file = sd->file;
236 if (key) *key = sd->key;
237 return;
238 }
239 249
240 efl_file_get(sd->img, file, key); 250 return efl_file_get(sd->img);
241} 251}
242 252
243EOLIAN static Eina_Bool 253EOLIAN static const char *
254_efl_ui_bg_efl_file_key_get(const Eo *obj, Efl_Ui_Bg_Data *sd)
255{
256 if (elm_widget_is_legacy(obj))
257 return sd->key;
258
259 return efl_file_key_get(sd->img);
260}
261
262EOLIAN static Eina_Error
244_efl_ui_bg_efl_file_mmap_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, 263_efl_ui_bg_efl_file_mmap_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd,
245 const Eina_File *file, const char *key) 264 const Eina_File *file)
246{ 265{
247 return efl_file_mmap_set(sd->img, file, key); 266 return efl_file_mmap_set(sd->img, file);
248} 267}
249 268
250EOLIAN static void 269EOLIAN static const Eina_File *
251_efl_ui_bg_efl_file_mmap_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, 270_efl_ui_bg_efl_file_mmap_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd)
252 const Eina_File **file, const char **key)
253{ 271{
254 efl_file_mmap_get(sd->img, file, key); 272 return efl_file_mmap_get(sd->img);
273}
274
275
276EOLIAN static Eo *
277_efl_ui_bg_efl_object_finalize(Eo *obj, Efl_Ui_Bg_Data *sd)
278{
279 obj = efl_finalize(efl_super(obj, MY_CLASS));
280 if (!obj) return NULL;
281 if (efl_file_get(sd->img) || efl_file_mmap_get(sd->img)) efl_file_load(sd->img);
282 return obj;
255} 283}
256 284
257/* Internal EO APIs and hidden overrides */ 285/* Internal EO APIs and hidden overrides */
@@ -264,7 +292,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
264#include "efl_ui_bg.eo.c" 292#include "efl_ui_bg.eo.c"
265 293
266 294
267#include "efl_ui_bg_legacy.eo.h" 295#include "efl_ui_bg_legacy_eo.h"
268 296
269#define MY_CLASS_NAME_LEGACY "elm_bg" 297#define MY_CLASS_NAME_LEGACY "elm_bg"
270 298
@@ -292,4 +320,4 @@ elm_bg_add(Evas_Object *parent)
292 return elm_legacy_add(EFL_UI_BG_LEGACY_CLASS, parent); 320 return elm_legacy_add(EFL_UI_BG_LEGACY_CLASS, parent);
293} 321}
294 322
295#include "efl_ui_bg_legacy.eo.c" 323#include "efl_ui_bg_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index b928549fef..bc0ef7efed 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -1,15 +1,17 @@
1class @beta Efl.Ui.Bg extends Efl.Ui.Layout implements Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller 1class @beta Efl.Ui.Bg extends Efl.Ui.Layout_Base implements Efl.File, Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
2{ 2{
3 [[The bg (background) widget is used for setting (solid) background decorations 3 [[The bg (background) widget is used for setting (solid) background decorations
4 for a window (unless it has transparency enabled) or for any container object. It 4 for a window (unless it has transparency enabled) or for any container object. It
5 works just like an image, but has some properties useful for backgrounds, such as 5 works just like an image, but has some properties useful for backgrounds, such as
6 setting it to tiled, centered, scaled or stretched. 6 setting it to tiled, centered, scaled or stretched.
7 ]] 7 ]]
8 legacy_prefix: elm_bg;
9 implements { 8 implements {
10 Efl.Object.constructor; 9 Efl.Object.constructor;
11 Efl.Object.destructor; 10 Efl.Object.destructor;
11 Efl.Object.finalize;
12 Efl.File.load;
12 Efl.File.file { get; set; } 13 Efl.File.file { get; set; }
14 Efl.File.key { get; set; }
13 Efl.File.mmap { get; set; } 15 Efl.File.mmap { get; set; }
14 Efl.Gfx.Color.color { get; set; } 16 Efl.Gfx.Color.color { get; set; }
15 Efl.Gfx.Image.scale_type { get; set; } 17 Efl.Gfx.Image.scale_type { get; set; }
diff --git a/src/lib/elementary/efl_ui_bg_eo.legacy.h b/src/lib/elementary/efl_ui_bg_eo.legacy.h
new file mode 100644
index 0000000000..8ad9bcd1f5
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _EFL_UI_BG_EO_LEGACY_H_
2#define _EFL_UI_BG_EO_LEGACY_H_
3
4#ifndef _EFL_UI_BG_EO_CLASS_TYPE
5#define _EFL_UI_BG_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Bg;
8
9#endif
10
11#ifndef _EFL_UI_BG_EO_TYPES
12#define _EFL_UI_BG_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/efl_ui_bg_legacy.eo b/src/lib/elementary/efl_ui_bg_legacy.eo
deleted file mode 100644
index cc681b0b8e..0000000000
--- a/src/lib/elementary/efl_ui_bg_legacy.eo
+++ /dev/null
@@ -1,14 +0,0 @@
1class @beta Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
2{
3 [[The bg (background) widget is used for setting (solid) background decorations
4
5 for a window (unless it has transparency enabled) or for any container object. It
6 works just like an image, but has some properties useful for backgrounds, such as
7 setting it to tiled, centered, scaled or stretched.
8 ]]
9 data: null;
10 implements {
11 class.constructor;
12 Efl.Object.constructor;
13 }
14}
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.c b/src/lib/elementary/efl_ui_bg_legacy_eo.c
new file mode 100644
index 0000000000..9cd23ff42f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.c
@@ -0,0 +1,35 @@
1
2Efl_Object *_efl_ui_bg_legacy_efl_object_constructor(Eo *obj, void *pd);
3
4
5static Eina_Bool
6_efl_ui_bg_legacy_class_initializer(Efl_Class *klass)
7{
8 const Efl_Object_Ops *opsp = NULL;
9
10 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
11
12#ifndef EFL_UI_BG_LEGACY_EXTRA_OPS
13#define EFL_UI_BG_LEGACY_EXTRA_OPS
14#endif
15
16 EFL_OPS_DEFINE(ops,
17 EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_bg_legacy_efl_object_constructor),
18 EFL_UI_BG_LEGACY_EXTRA_OPS
19 );
20 opsp = &ops;
21
22 return efl_class_functions_set(klass, opsp, ropsp);
23}
24
25static const Efl_Class_Description _efl_ui_bg_legacy_class_desc = {
26 EO_VERSION,
27 "Efl.Ui.Bg_Legacy",
28 EFL_CLASS_TYPE_REGULAR,
29 0,
30 _efl_ui_bg_legacy_class_initializer,
31 _efl_ui_bg_legacy_class_constructor,
32 NULL
33};
34
35EFL_DEFINE_CLASS(efl_ui_bg_legacy_class_get, &_efl_ui_bg_legacy_class_desc, EFL_UI_BG_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.h b/src/lib/elementary/efl_ui_bg_legacy_eo.h
new file mode 100644
index 0000000000..ea3641dc2e
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.h
@@ -0,0 +1,32 @@
1#ifndef _EFL_UI_BG_LEGACY_EO_H_
2#define _EFL_UI_BG_LEGACY_EO_H_
3
4#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Bg_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
12#define _EFL_UI_BG_LEGACY_EO_TYPES
13
14
15#endif
16#ifdef EFL_BETA_API_SUPPORT
17/**
18 * @brief The bg (background) widget is used for setting (solid) background
19 * decorations
20 *
21 * for a window (unless it has transparency enabled) or for any container
22 * object. It works just like an image, but has some properties useful for
23 * backgrounds, such as setting it to tiled, centered, scaled or stretched.
24 *
25 * @ingroup Efl_Ui_Bg_Legacy
26 */
27#define EFL_UI_BG_LEGACY_CLASS efl_ui_bg_legacy_class_get()
28
29EWAPI const Efl_Class *efl_ui_bg_legacy_class_get(void);
30#endif /* EFL_BETA_API_SUPPORT */
31
32#endif
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h
new file mode 100644
index 0000000000..7498da1144
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _EFL_UI_BG_LEGACY_EO_LEGACY_H_
2#define _EFL_UI_BG_LEGACY_EO_LEGACY_H_
3
4#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Bg_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
12#define _EFL_UI_BG_LEGACY_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index dbf4584503..c577bb8e9d 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -194,14 +194,6 @@ _efl_ui_box_efl_container_content_count(Eo *obj, Efl_Ui_Box_Data *pd EINA_UNUSED
194} 194}
195 195
196EOLIAN static Eina_Bool 196EOLIAN static Eina_Bool
197_efl_ui_box_efl_container_content_remove(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *pd EINA_UNUSED, Efl_Gfx_Entity *content)
198{
199 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, 0);
200
201 return evas_object_box_remove(wd->resize_obj, content);
202}
203
204EOLIAN static Eina_Bool
205_efl_ui_box_efl_pack_pack_clear(Eo *obj, Efl_Ui_Box_Data *pd) 197_efl_ui_box_efl_pack_pack_clear(Eo *obj, Efl_Ui_Box_Data *pd)
206{ 198{
207 Eina_Bool ret; 199 Eina_Bool ret;
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 164bdb8879..6ec2da277f 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -30,7 +30,6 @@ class @beta Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pac
30 implements { 30 implements {
31 Efl.Object.constructor; 31 Efl.Object.constructor;
32 Efl.Canvas.Group.group_calculate; 32 Efl.Canvas.Group.group_calculate;
33 Efl.Container.content_remove;
34 Efl.Container.content_iterate; 33 Efl.Container.content_iterate;
35 Efl.Container.content_count; 34 Efl.Container.content_count;
36 Efl.Ui.Direction.direction { get; set; } 35 Efl.Ui.Direction.direction { get; set; }
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 90c5d1b42f..4cc00e0c48 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -1,6 +1,7 @@
1#define EFL_GFX_HINT_PROTECTED 1#define EFL_GFX_HINT_PROTECTED
2 2
3#include "efl_ui_box_private.h" 3#include "efl_ui_box_private.h"
4#include "efl_ui_container_layout.h"
4 5
5// FIXME: handle RTL? just invert the horizontal order? 6// FIXME: handle RTL? just invert the horizontal order?
6 7
@@ -11,65 +12,19 @@ struct _Item_Calc
11 EINA_INLIST; 12 EINA_INLIST;
12 13
13 Evas_Object *obj; 14 Evas_Object *obj;
14 double weight[2]; 15 double weight_factor;
15 double align[2]; 16 Efl_Ui_Container_Item_Hints hints[2]; /* 0 is x-axis, 1 is y-axis */
16 double space[2];
17 double comp_factor;
18 Eina_Bool fill[2];
19 Eina_Size2D max, min, aspect;
20 int pad[4];
21 Efl_Gfx_Hint_Aspect aspect_type;
22 int id;
23}; 17};
24 18
25static int 19static int
26weight_sort_cb(const void *l1, const void *l2) 20_weight_sort_cb(const void *l1, const void *l2)
27{ 21{
28 Item_Calc *it1, *it2; 22 Item_Calc *it1, *it2;
29 23
30 it1 = EINA_INLIST_CONTAINER_GET(l1, Item_Calc); 24 it1 = EINA_INLIST_CONTAINER_GET(l1, Item_Calc);
31 it2 = EINA_INLIST_CONTAINER_GET(l2, Item_Calc); 25 it2 = EINA_INLIST_CONTAINER_GET(l2, Item_Calc);
32 26
33 return it2->comp_factor <= it1->comp_factor ? -1 : 1; 27 return it2->weight_factor <= it1->weight_factor ? -1 : 1;
34}
35
36static inline void
37_min_max_calc(Item_Calc *item, int *cw, int *ch, Eina_Bool aspect_check)
38{
39 int w = *cw, h = *ch;
40
41 if (aspect_check)
42 {
43 w = h * item->aspect.w / item->aspect.h;
44 if (w > *cw)
45 {
46 w = *cw;
47 h = w * item->aspect.h / item->aspect.w;
48 }
49 }
50
51 if (w > item->max.w)
52 {
53 w = item->max.w;
54 if (aspect_check) h = w * item->aspect.h / item->aspect.w;
55 }
56 if (h > item->max.h)
57 {
58 h = item->max.h;
59 if (aspect_check) w = h * item->aspect.w / item->aspect.h;
60 }
61 if (w < item->min.w)
62 {
63 w = item->min.w;
64 if (aspect_check) h = w * item->aspect.h / item->aspect.w;
65 }
66 if (h < item->min.h)
67 {
68 h = item->min.h;
69 if (aspect_check) w = h * item->aspect.w / item->aspect.h;
70 }
71 *cw = w;
72 *ch = h;
73} 28}
74 29
75void 30void
@@ -77,279 +32,172 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
77{ 32{
78 Efl_Ui_Box_Data *pd = efl_data_scope_get(ui_box, EFL_UI_BOX_CLASS); 33 Efl_Ui_Box_Data *pd = efl_data_scope_get(ui_box, EFL_UI_BOX_CLASS);
79 Evas_Object_Box_Option *opt; 34 Evas_Object_Box_Option *opt;
80 Evas_Object *o;
81 Eina_List *li; 35 Eina_List *li;
82 Eina_Inlist *inlist = NULL; 36 Eina_Inlist *inlist = NULL;
83 int wantw = 0, wanth = 0; // requested size
84 Eina_Rect boxs;
85 Item_Calc *items, *item; 37 Item_Calc *items, *item;
86 Eina_Bool horiz = efl_ui_dir_is_horizontal(pd->dir, EINA_FALSE); 38 Efl_Ui_Container_Item_Hints *hints, *hint;
87 int id = 0, count, boxl = 0, boxr = 0, boxt = 0, boxb = 0; 39 Eina_Bool axis = !efl_ui_dir_is_horizontal(pd->dir, EINA_FALSE);
88 int length, want, pad; 40 Eina_Bool r_axis = !axis;
89 double cur_pos, weight[2] = { 0, 0 }, scale, mmin = 0; 41 int want[2] = { 0, 0 };
90 double box_align[2]; 42 int count, i = 0;
91 Eina_Bool box_fill[2] = { EINA_FALSE, EINA_FALSE }; 43 double cur_pos, mmin = 0, weight_sum = 0;
92 44 Efl_Ui_Container_Layout_Calc box_calc[2]; /* 0 is x-axis, 1 is y-axis */
93 boxs = efl_gfx_entity_geometry_get(ui_box); 45
94 efl_gfx_hint_margin_get(ui_box, &boxl, &boxr, &boxt, &boxb);
95 scale = efl_gfx_entity_scale_get(ui_box);
96
97 // Box align: used if "item has max size and fill" or "no item has a weight"
98 // Note: cells always expand on the orthogonal direction
99 box_align[0] = pd->align.h;
100 box_align[1] = pd->align.v;
101 if (box_align[0] < 0)
102 {
103 box_fill[0] = EINA_TRUE;
104 box_align[0] = 0.5;
105 }
106 if (box_align[1] < 0)
107 {
108 box_fill[1] = EINA_TRUE;
109 box_align[1] = 0.5;
110 }
111 46
112 count = eina_list_count(bd->children); 47 count = eina_list_count(bd->children);
113 if (!count) 48 if (!count)
114 { 49 {
115 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(0, 0)); 50 efl_gfx_hint_size_restricted_min_set(ui_box, EINA_SIZE2D(0, 0));
116 return; 51 return;
117 } 52 }
118 53
54 _efl_ui_container_layout_init(ui_box, box_calc);
55
119 items = alloca(count * sizeof(*items)); 56 items = alloca(count * sizeof(*items));
120#ifdef DEBUG 57#ifdef DEBUG
121 memset(items, 0, count * sizeof(*items)); 58 memset(items, 0, count * sizeof(*items));
122#endif 59#endif
123 60
124 // box outer margin
125 boxs.w -= boxl + boxr;
126 boxs.h -= boxt + boxb;
127 boxs.x += boxl;
128 boxs.y += boxt;
129
130 // scan all items, get their properties, calculate total weight & min size 61 // scan all items, get their properties, calculate total weight & min size
131 EINA_LIST_FOREACH(bd->children, li, opt) 62 EINA_LIST_FOREACH(bd->children, li, opt)
132 { 63 {
133 item = &items[id]; 64 item = &items[i++];
134 o = item->obj = opt->obj; 65 item->obj = opt->obj;
135 66 hints = item->hints;
136 efl_gfx_hint_weight_get(o, &item->weight[0], &item->weight[1]);
137 efl_gfx_hint_align_get(o, &item->align[0], &item->align[1]);
138 efl_gfx_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]);
139 efl_gfx_hint_fill_get(o, &item->fill[0], &item->fill[1]);
140 item->max = efl_gfx_hint_size_max_get(o);
141 item->min = efl_gfx_hint_size_combined_min_get(o);
142 efl_gfx_hint_aspect_get(o, &item->aspect_type, &item->aspect);
143
144 if (horiz && (box_fill[0] || pd->homogeneous)) item->weight[0] = 1;
145 else if (item->weight[0] < 0) item->weight[0] = 0;
146 if (!horiz && (box_fill[1] || pd->homogeneous)) item->weight[1] = 1;
147 else if (item->weight[1] < 0) item->weight[1] = 0;
148
149 if (EINA_DBL_EQ(item->align[0], -1))
150 {
151 item->align[0] = 0.5;
152 item->fill[0] = EINA_TRUE;
153 }
154 else if (item->align[0] < 0) item->align[0] = 0;
155 else if (item->align[0] > 1) item->align[0] = 1;
156 if (EINA_DBL_EQ(item->align[1], -1))
157 {
158 item->align[1] = 0.5;
159 item->fill[1] = EINA_TRUE;
160 }
161 else if (item->align[1] < 0) item->align[1] = 0;
162 else if (item->align[1] > 1) item->align[1] = 1;
163 67
164 if (item->min.w < 0) item->min.w = 0; 68 _efl_ui_container_layout_item_init(item->obj, hints);
165 if (item->min.h < 0) item->min.h = 0;
166 69
167 if (item->max.w < 0) item->max.w = INT_MAX; 70 if (pd->homogeneous || box_calc[0].fill)
168 if (item->max.h < 0) item->max.h = INT_MAX; 71 hints[0].weight = 1;
72 else if (hints[0].weight < 0)
73 hints[0].weight = 0;
169 74
170 weight[0] += item->weight[0]; 75 if (pd->homogeneous || box_calc[1].fill)
171 weight[1] += item->weight[1]; 76 hints[1].weight = 1;
77 else if (hints[1].weight < 0)
78 hints[1].weight = 0;
172 79
173 if ((item->aspect.w <= 0) || (item->aspect.h <= 0)) 80 weight_sum += hints[axis].weight;
174 {
175 if ((item->aspect.w <= 0) ^ (item->aspect.h <= 0))
176 {
177 ERR("Invalid aspect parameter for obj: %p", item->obj);
178 item->aspect.w = item->aspect.h = 0;
179 item->aspect_type = EFL_GFX_HINT_ASPECT_NONE;
180 }
181 }
182 else
183 {
184 _min_max_calc(item, &item->min.w, &item->min.h, EINA_TRUE);
185 }
186 81
187 item->space[0] = item->min.w + item->pad[0] + item->pad[1]; 82 if (hints[r_axis].space > want[r_axis])
188 item->space[1] = item->min.h + item->pad[2] + item->pad[3]; 83 want[r_axis] = hints[r_axis].space;
189 84
190 if (horiz) 85 if (pd->homogeneous)
191 { 86 {
192 if (item->space[1] > wanth) 87 if (hints[axis].space > mmin)
193 wanth = item->space[1]; 88 mmin = hints[axis].space;
194 if (pd->homogeneous)
195 {
196 if (item->space[0] > mmin)
197 mmin = item->space[0];
198 }
199 else
200 {
201 wantw += item->space[0];
202 }
203 } 89 }
204 else 90 else
205 { 91 {
206 if (item->space[0] > wantw) 92 want[axis] += hints[axis].space;
207 wantw = item->space[0];
208 if (pd->homogeneous)
209 {
210 if (item->space[1] > mmin)
211 mmin = item->space[1];
212 }
213 else
214 {
215 wanth += item->space[1];
216 }
217 } 93 }
218
219 item->id = id++;
220 } 94 }
221 95
222 // total space & available space 96 // total space & available space
223 if (horiz) 97 if (pd->homogeneous)
224 { 98 want[axis] = mmin * count;
225 if (pd->homogeneous) 99
226 wantw = mmin * count; 100 if (box_calc[r_axis].size < want[r_axis])
227 want = wantw; 101 box_calc[r_axis].size = want[r_axis];
228 length = boxs.w;
229 pad = pd->pad.scalable ? (pd->pad.h * scale) : pd->pad.h;
230 if (boxs.h < wanth)
231 boxs.h = wanth;
232 }
233 else
234 {
235 if (pd->homogeneous)
236 wanth = mmin * count;
237 want = wanth;
238 length = boxs.h;
239 pad = pd->pad.scalable ? (pd->pad.v * scale) : pd->pad.v;
240 if (boxs.w < wantw)
241 boxs.w = wantw;
242 }
243 102
244 // padding can not be squeezed (note: could make it an option) 103 // padding can not be squeezed (note: could make it an option)
245 length -= pad * (count - 1); 104 box_calc[axis].size -= (box_calc[axis].pad * (count - 1));
246 cur_pos = horiz ? boxs.x : boxs.y; 105 box_calc[r_axis].pad = 0;
106 cur_pos = box_calc[axis].pos;
247 107
248 // calculate weight length 108 // calculate weight size
249 if (!pd->homogeneous && (length > want) && (weight[!horiz] > 0)) 109 if (!pd->homogeneous && (box_calc[axis].size > want[axis]) && (weight_sum > 0))
250 { 110 {
251 int orig_length = length; 111 int orig_size, calc_size;
252 double orig_weight = weight[!horiz]; 112 double orig_weight = weight_sum;
113
114 calc_size = orig_size = box_calc[axis].size;
253 115
254 for (id = 0; id < count; id++) 116 for (i = 0; i < count; i++)
255 { 117 {
256 double denom; 118 double denom;
257 item = &items[id]; 119 hint = &items[i].hints[axis];
258 120
259 denom = (item->weight[!horiz] * orig_length) - 121 denom = (hint->weight * orig_size) - (orig_weight * hint->space);
260 (orig_weight * item->space[!horiz]);
261 if (denom > 0) 122 if (denom > 0)
262 { 123 {
263 item->comp_factor = (item->weight[!horiz] * orig_length) / denom; 124 items[i].weight_factor = (hint->weight * orig_size) / denom;
264 inlist = eina_inlist_sorted_insert(inlist, EINA_INLIST_GET(item), 125 inlist = eina_inlist_sorted_insert(inlist, EINA_INLIST_GET(&items[i]),
265 weight_sort_cb); 126 _weight_sort_cb);
127
266 } 128 }
267 else 129 else
268 { 130 {
269 length -= item->space[!horiz]; 131 calc_size -= hint->space;
270 weight[!horiz] -= item->weight[!horiz]; 132 weight_sum -= hint->weight;
271 } 133 }
272 } 134 }
273 135
274 EINA_INLIST_FOREACH(inlist, item) 136 EINA_INLIST_FOREACH(inlist, item)
275 { 137 {
276 double weight_len; 138 double weight_len;
139 hint = &item->hints[axis];
277 140
278 weight_len = (length * item->weight[!horiz]) / weight[!horiz]; 141 weight_len = (calc_size * hint->weight) / weight_sum;
279 if (item->space[!horiz] < weight_len) 142 if (hint->space < weight_len)
280 { 143 {
281 item->space[!horiz] = weight_len; 144 hint->space = weight_len;
282 } 145 }
283 else 146 else
284 { 147 {
285 weight[!horiz] -= item->weight[!horiz]; 148 weight_sum -= hint->weight;
286 length -= item->space[!horiz]; 149 calc_size -= hint->space;
287 } 150 }
288 } 151 }
289 } 152 }
290 153
291 // calculate item geometry 154 // calculate item geometry
292 { 155 {
293 int x, y, w, h, sw, sh; 156 int item_size[2], item_pos[2], sw, sh;
294 157
295 if (length > want) 158 if (box_calc[axis].size > want[axis])
296 { 159 {
297 if (pd->homogeneous) 160 if (pd->homogeneous)
298 mmin = (double)length / count; 161 mmin = (double)box_calc[axis].size / count;
299 else if (EINA_DBL_EQ(weight[!horiz], 0)) 162 else if (EINA_DBL_EQ(weight_sum, 0))
300 cur_pos += (length - want) * box_align[!horiz]; 163 cur_pos += (box_calc[axis].size - want[axis]) * box_calc[axis].align;
301 } 164 }
302 165
303 for (id = 0; id < count; id++) 166 for (i = 0; i < count; i++)
304 { 167 {
305 item = &items[id]; 168 hints = items[i].hints;
169
306 if (pd->homogeneous) 170 if (pd->homogeneous)
307 item->space[!horiz] = mmin; 171 hints[axis].space = mmin;
308 item->space[horiz] = horiz ? boxs.h : boxs.w; 172 hints[r_axis].space = box_calc[r_axis].size;
309 sw = item->space[0] - item->pad[0] - item->pad[1]; 173 sw = hints[0].space - (hints[0].margin[0] + hints[0].margin[1]);
310 sh = item->space[1] - item->pad[2] - item->pad[3]; 174 sh = hints[1].space - (hints[1].margin[0] + hints[1].margin[1]);
311 175
312 if ((item->weight[0] > 0) && item->fill[0]) 176 item_size[0] = ((hints[0].weight > 0) && hints[0].fill) ? sw : 0;
313 w = sw; 177 item_size[1] = ((hints[1].weight > 0) && hints[1].fill) ? sh : 0;
314 else
315 w = 0;
316 178
317 if ((item->weight[1] > 0) && item->fill[1]) 179 _efl_ui_container_layout_min_max_calc(hints, &item_size[0], &item_size[1],
318 h = sh; 180 (hints[0].aspect > 0) && (hints[1].aspect > 0));
319 else
320 h = 0;
321 181
322 _min_max_calc(item, &w, &h, (item->aspect.w > 0) && 182 item_pos[axis] = cur_pos + 0.5;
323 (item->aspect.h > 0)); 183 item_pos[r_axis] = box_calc[r_axis].pos;
324 if (horiz) 184
325 { 185 item_pos[0] += (hints[0].margin[0] +
326 x = cur_pos + 0.5; 186 ((sw - item_size[0]) * hints[0].align));
327 y = boxs.y; 187 item_pos[1] += (hints[1].margin[0] +
328 } 188 ((sh - item_size[1]) * hints[1].align));
329 else
330 {
331 x = boxs.x;
332 y = cur_pos + 0.5;
333 }
334 x += item->pad[0] + ((sw - w) * item->align[0]);
335 y += item->pad[2] + ((sh - h) * item->align[1]);
336 189
337 cur_pos += item->space[!horiz] + pad; 190 cur_pos += hints[axis].space + box_calc[axis].pad;
338 191
339 efl_gfx_entity_geometry_set(item->obj, EINA_RECT(x, y, w, h)); 192 efl_gfx_entity_geometry_set(items[i].obj,
193 EINA_RECT(item_pos[0], item_pos[1],
194 item_size[0], item_size[1]));
340 } 195 }
341 } 196 }
197 want[0] += (box_calc[0].margin[0] + box_calc[0].margin[1]) +
198 (box_calc[0].pad * (count - 1));
199 want[1] += (box_calc[1].margin[0] + box_calc[1].margin[1]) +
200 (box_calc[1].pad * (count - 1));
342 201
343 if (horiz) 202 efl_gfx_hint_size_restricted_min_set(ui_box, EINA_SIZE2D(want[0], want[1]));
344 {
345 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(
346 wantw + boxl + boxr + pad * (count - 1),
347 wanth + boxt + boxb));
348 }
349 else
350 {
351 efl_gfx_hint_size_min_set(ui_box, EINA_SIZE2D(
352 wantw + boxl + boxr,
353 wanth + pad * (count - 1) + boxt + boxb));
354 }
355} 203}
diff --git a/src/lib/elementary/efl_ui_box_private.h b/src/lib/elementary/efl_ui_box_private.h
index 2bd12c9fe8..86a51398d2 100644
--- a/src/lib/elementary/efl_ui_box_private.h
+++ b/src/lib/elementary/efl_ui_box_private.h
@@ -11,7 +11,7 @@
11#include "elm_priv.h" 11#include "elm_priv.h"
12 12
13// FIXME: stop using Evas.Box 13// FIXME: stop using Evas.Box
14#include <../evas/canvas/evas_box.eo.h> 14#include <../evas/canvas/evas_box_eo.h>
15 15
16// FIXME: stop using evas box 16// FIXME: stop using evas box
17void _efl_ui_box_custom_layout(Efl_Ui_Box *box, Evas_Object_Box_Data *priv); 17void _efl_ui_box_custom_layout(Efl_Ui_Box *box, Evas_Object_Box_Data *priv);
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 1be677dca3..1bff2c930b 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -255,10 +255,10 @@ _efl_ui_button_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Button_Data *_pd EINA_
255 255
256 elm_widget_can_focus_set(obj, EINA_TRUE); 256 elm_widget_can_focus_set(obj, EINA_TRUE);
257 257
258 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 258 if (elm_widget_theme_object_set(obj, wd->resize_obj,
259 elm_widget_theme_klass_get(obj), 259 elm_widget_theme_klass_get(obj),
260 elm_widget_theme_element_get(obj), 260 elm_widget_theme_element_get(obj),
261 elm_widget_theme_style_get(obj))) 261 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
262 CRI("Failed to set layout!"); 262 CRI("Failed to set layout!");
263} 263}
264 264
@@ -410,7 +410,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
410 410
411#include "efl_ui_button.eo.c" 411#include "efl_ui_button.eo.c"
412 412
413#include "efl_ui_button_legacy.eo.h" 413#include "efl_ui_button_legacy_eo.h"
414#include "efl_ui_button_legacy_part.eo.h" 414#include "efl_ui_button_legacy_part.eo.h"
415 415
416EOLIAN static Eo * 416EOLIAN static Eo *
@@ -442,13 +442,13 @@ _icon_signal_emit(Evas_Object *obj)
442/* FIXME: replicated from elm_layout just because button's icon spot 442/* FIXME: replicated from elm_layout just because button's icon spot
443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 443 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
444 * can changed the theme API */ 444 * can changed the theme API */
445EOLIAN static Efl_Ui_Theme_Apply_Result 445EOLIAN static Eina_Error
446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 446_efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
447{ 447{
448 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 448 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
449 449
450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS)); 450 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_BUTTON_LEGACY_CLASS));
451 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 451 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
452 _icon_signal_emit(obj); 452 _icon_signal_emit(obj);
453 453
454 return int_ret; 454 return int_ret;
@@ -507,4 +507,4 @@ elm_button_add(Evas_Object *parent)
507 return elm_legacy_add(EFL_UI_BUTTON_LEGACY_CLASS, parent); 507 return elm_legacy_add(EFL_UI_BUTTON_LEGACY_CLASS, parent);
508} 508}
509 509
510#include "efl_ui_button_legacy.eo.c" 510#include "efl_ui_button_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index ff79209e27..b126588179 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Autorepeat, 1class @beta Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
2 Efl.Text, Efl.Content, 2 Efl.Text, Efl.Content,
3 Efl.Access.Widget.Action 3 Efl.Access.Widget.Action
4{ 4{
@@ -7,7 +7,6 @@ class @beta Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl
7 Press it and run some function. It can contain a simple label and icon 7 Press it and run some function. It can contain a simple label and icon
8 object and it also has an autorepeat feature. 8 object and it also has an autorepeat feature.
9 ]] 9 ]]
10 legacy_prefix: elm_button;
11 implements { 10 implements {
12 class.constructor; 11 class.constructor;
13 Efl.Object.constructor; 12 Efl.Object.constructor;
@@ -16,7 +15,7 @@ class @beta Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl
16 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; } 15 Efl.Ui.Autorepeat.autorepeat_enabled { set; get; }
17 Efl.Ui.Autorepeat.autorepeat_supported { get;} 16 Efl.Ui.Autorepeat.autorepeat_supported { get;}
18 Efl.Ui.Widget.on_access_activate; 17 Efl.Ui.Widget.on_access_activate;
19 Efl.Ui.Widget.widget_event; 18 Efl.Ui.Widget.widget_input_event_handler;
20 Efl.Access.Widget.Action.elm_actions { get; } 19 Efl.Access.Widget.Action.elm_actions { get; }
21 Efl.Content.content { get; set; } 20 Efl.Content.content { get; set; }
22 Efl.Content.content_unset; 21 Efl.Content.content_unset;
diff --git a/src/lib/elementary/efl_ui_button_eo.legacy.h b/src/lib/elementary/efl_ui_button_eo.legacy.h
new file mode 100644
index 0000000000..7bfbbe8a15
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _EFL_UI_BUTTON_EO_LEGACY_H_
2#define _EFL_UI_BUTTON_EO_LEGACY_H_
3
4#ifndef _EFL_UI_BUTTON_EO_CLASS_TYPE
5#define _EFL_UI_BUTTON_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Button;
8
9#endif
10
11#ifndef _EFL_UI_BUTTON_EO_TYPES
12#define _EFL_UI_BUTTON_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/efl_ui_button_legacy.eo b/src/lib/elementary/efl_ui_button_legacy.eo
deleted file mode 100644
index 557704b9d2..0000000000
--- a/src/lib/elementary/efl_ui_button_legacy.eo
+++ /dev/null
@@ -1,15 +0,0 @@
1class @beta Efl.Ui.Button_Legacy extends Efl.Ui.Button implements Efl.Ui.Legacy
2{
3 [[Push-button widget
4
5 Press it and run some function. It can contain a simple label and icon
6 object and it also has an autorepeat feature.
7 ]]
8 data: null;
9 implements {
10 Efl.Object.constructor;
11 Efl.Ui.Widget.theme_apply;
12 Efl.Ui.Widget.widget_sub_object_del;
13 Efl.Part.part_get;
14 }
15}
diff --git a/src/lib/elementary/efl_ui_button_legacy_eo.c b/src/lib/elementary/efl_ui_button_legacy_eo.c
new file mode 100644
index 0000000000..0fcd13af64
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_legacy_eo.c
@@ -0,0 +1,47 @@
1
2Efl_Object *_efl_ui_button_legacy_efl_object_constructor(Eo *obj, void *pd);
3
4
5Eina_Error _efl_ui_button_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
6
7
8Eina_Bool _efl_ui_button_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj, void *pd, Efl_Canvas_Object *sub_obj);
9
10
11Efl_Object *_efl_ui_button_legacy_efl_part_part_get(const Eo *obj, void *pd, const char *name);
12
13
14static Eina_Bool
15_efl_ui_button_legacy_class_initializer(Efl_Class *klass)
16{
17 const Efl_Object_Ops *opsp = NULL;
18
19 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
20
21#ifndef EFL_UI_BUTTON_LEGACY_EXTRA_OPS
22#define EFL_UI_BUTTON_LEGACY_EXTRA_OPS
23#endif
24
25 EFL_OPS_DEFINE(ops,
26 EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_button_legacy_efl_object_constructor),
27 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _efl_ui_button_legacy_efl_ui_widget_theme_apply),
28 EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _efl_ui_button_legacy_efl_ui_widget_widget_sub_object_del),
29 EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_button_legacy_efl_part_part_get),
30 EFL_UI_BUTTON_LEGACY_EXTRA_OPS
31 );
32 opsp = &ops;
33
34 return efl_class_functions_set(klass, opsp, ropsp);
35}
36
37static const Efl_Class_Description _efl_ui_button_legacy_class_desc = {
38 EO_VERSION,
39 "Efl.Ui.Button_Legacy",
40 EFL_CLASS_TYPE_REGULAR,
41 0,
42 _efl_ui_button_legacy_class_initializer,
43 NULL,
44 NULL
45};
46
47EFL_DEFINE_CLASS(efl_ui_button_legacy_class_get, &_efl_ui_button_legacy_class_desc, EFL_UI_BUTTON_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_button_legacy_eo.h b/src/lib/elementary/efl_ui_button_legacy_eo.h
new file mode 100644
index 0000000000..31630d64ef
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_legacy_eo.h
@@ -0,0 +1,30 @@
1#ifndef _EFL_UI_BUTTON_LEGACY_EO_H_
2#define _EFL_UI_BUTTON_LEGACY_EO_H_
3
4#ifndef _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Button_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_BUTTON_LEGACY_EO_TYPES
12#define _EFL_UI_BUTTON_LEGACY_EO_TYPES
13
14
15#endif
16#ifdef EFL_BETA_API_SUPPORT
17/**
18 * @brief Push-button widget
19 *
20 * Press it and run some function. It can contain a simple label and icon
21 * object and it also has an autorepeat feature.
22 *
23 * @ingroup Efl_Ui_Button_Legacy
24 */
25#define EFL_UI_BUTTON_LEGACY_CLASS efl_ui_button_legacy_class_get()
26
27EWAPI const Efl_Class *efl_ui_button_legacy_class_get(void);
28#endif /* EFL_BETA_API_SUPPORT */
29
30#endif
diff --git a/src/lib/elementary/efl_ui_button_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_button_legacy_eo.legacy.h
new file mode 100644
index 0000000000..2fa216cb99
--- /dev/null
+++ b/src/lib/elementary/efl_ui_button_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _EFL_UI_BUTTON_LEGACY_EO_LEGACY_H_
2#define _EFL_UI_BUTTON_LEGACY_EO_LEGACY_H_
3
4#ifndef _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_BUTTON_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Button_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_BUTTON_LEGACY_EO_TYPES
12#define _EFL_UI_BUTTON_LEGACY_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/efl_ui_caching_factory.c b/src/lib/elementary/efl_ui_caching_factory.c
index cfd8182617..bea7a3360c 100644
--- a/src/lib/elementary/efl_ui_caching_factory.c
+++ b/src/lib/elementary/efl_ui_caching_factory.c
@@ -324,13 +324,14 @@ _efl_ui_caching_factory_efl_object_parent_set(Eo *obj, Efl_Ui_Caching_Factory_Da
324 if (a) efl_event_callback_add(a, EFL_APP_EVENT_PAUSE, _efl_ui_caching_factory_pause, pd); 324 if (a) efl_event_callback_add(a, EFL_APP_EVENT_PAUSE, _efl_ui_caching_factory_pause, pd);
325} 325}
326 326
327static void 327static Eina_Error
328_efl_ui_caching_factory_efl_ui_property_bind_property_bind(Eo *obj, Efl_Ui_Caching_Factory_Data *pd, 328_efl_ui_caching_factory_efl_ui_property_bind_property_bind(Eo *obj, Efl_Ui_Caching_Factory_Data *pd,
329 const char *key, const char *property) 329 const char *key, const char *property)
330{ 330{
331 if (!strcmp(key, "style")) 331 if (!strcmp(key, "style"))
332 eina_stringshare_replace(&pd->style, property); 332 eina_stringshare_replace(&pd->style, property);
333 efl_ui_property_bind(efl_super(obj, EFL_UI_CACHING_FACTORY_CLASS), key, property); 333
334 return efl_ui_property_bind(efl_super(obj, EFL_UI_CACHING_FACTORY_CLASS), key, property);
334} 335}
335 336
336#include "efl_ui_caching_factory.eo.c" 337#include "efl_ui_caching_factory.eo.c"
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 3e5d34dd7a..a4df1829a8 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -510,13 +510,13 @@ _spinner_buttons_add(Evas_Object *obj, Efl_Ui_Calendar_Data *sd)
510 } 510 }
511} 511}
512 512
513EOLIAN static Efl_Ui_Theme_Apply_Result 513EOLIAN static Eina_Error
514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd) 514_efl_ui_calendar_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Calendar_Data *sd)
515{ 515{
516 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 516 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
517 517
518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 518 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
519 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 519 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
520 520
521 _spinner_buttons_add(obj, sd); 521 _spinner_buttons_add(obj, sd);
522 522
@@ -938,10 +938,10 @@ _efl_ui_calendar_constructor_internal(Eo *obj, Efl_Ui_Calendar_Data *priv)
938 938
939 if (!elm_widget_theme_klass_get(obj)) 939 if (!elm_widget_theme_klass_get(obj))
940 elm_widget_theme_klass_set(obj, "calendar"); 940 elm_widget_theme_klass_set(obj, "calendar");
941 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 941 if (elm_widget_theme_object_set(obj, wd->resize_obj,
942 elm_widget_theme_klass_get(obj), 942 elm_widget_theme_klass_get(obj),
943 elm_widget_theme_element_get(obj), 943 elm_widget_theme_element_get(obj),
944 elm_widget_theme_style_get(obj))) 944 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
945 CRI("Failed to set layout!"); 945 CRI("Failed to set layout!");
946 946
947 evas_object_smart_changed(obj); 947 evas_object_smart_changed(obj);
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 33547507da..7bf81da305 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
16 last [[Sentinel value to indicate last enum field during iteration]] 16 last [[Sentinel value to indicate last enum field during iteration]]
17} 17}
18 18
19class @beta Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format 19class @beta Efl.Ui.Calendar extends Efl.Ui.Layout_Base implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
20{ 20{
21 [[Calendar widget 21 [[Calendar widget
22 22
@@ -109,7 +109,7 @@ class @beta Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Compos
109 Efl.Ui.Widget.theme_apply; 109 Efl.Ui.Widget.theme_apply;
110 Efl.Ui.Widget.on_access_update; 110 Efl.Ui.Widget.on_access_update;
111 Efl.Ui.Focus.Object.on_focus_update; 111 Efl.Ui.Focus.Object.on_focus_update;
112 Efl.Ui.Widget.widget_event; 112 Efl.Ui.Widget.widget_input_event_handler;
113 Efl.Access.Widget.Action.elm_actions { get; } 113 Efl.Access.Widget.Action.elm_actions { get; }
114 Efl.Ui.Format.format_cb { set; } 114 Efl.Ui.Format.format_cb { set; }
115 Efl.Ui.Format.format_string { set; get;} 115 Efl.Ui.Format.format_string { set; get;}
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 6b5dd01645..6056e5c572 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -100,7 +100,7 @@ _activate(Evas_Object *obj)
100 100
101 if (_elm_config->atspi_mode) 101 if (_elm_config->atspi_mode)
102 efl_access_state_changed_signal_emit(obj, 102 efl_access_state_changed_signal_emit(obj,
103 EFL_ACCESS_STATE_CHECKED, 103 EFL_ACCESS_STATE_TYPE_CHECKED,
104 efl_ui_nstate_value_get(obj)); 104 efl_ui_nstate_value_get(obj));
105} 105}
106 106
@@ -112,7 +112,7 @@ _efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data *
112 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); 112 states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
113 113
114 if (elm_check_state_get(obj)) 114 if (elm_check_state_get(obj))
115 STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED); 115 STATE_TYPE_SET(states, EFL_ACCESS_STATE_TYPE_CHECKED);
116 116
117 return states; 117 return states;
118} 118}
@@ -135,16 +135,15 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
135 return EINA_TRUE; 135 return EINA_TRUE;
136} 136}
137 137
138EOLIAN static Efl_Ui_Theme_Apply_Result 138EOLIAN static Eina_Error
139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) 139_efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED)
140{ 140{
141 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 141 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
142 142
143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); 143 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC);
144 144
145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 145 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
146 146 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
147 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL;
148 147
149 if (elm_widget_is_legacy(obj)) 148 if (elm_widget_is_legacy(obj))
150 { 149 {
@@ -234,7 +233,7 @@ _on_check_off(void *data,
234 233
235 if (_elm_config->atspi_mode) 234 if (_elm_config->atspi_mode)
236 efl_access_state_changed_signal_emit(data, 235 efl_access_state_changed_signal_emit(data,
237 EFL_ACCESS_STATE_CHECKED, 236 EFL_ACCESS_STATE_TYPE_CHECKED,
238 efl_ui_nstate_value_get(obj)); 237 efl_ui_nstate_value_get(obj));
239} 238}
240 239
@@ -259,7 +258,7 @@ _on_check_on(void *data,
259 258
260 if (_elm_config->atspi_mode) 259 if (_elm_config->atspi_mode)
261 efl_access_state_changed_signal_emit(data, 260 efl_access_state_changed_signal_emit(data,
262 EFL_ACCESS_STATE_CHECKED, 261 EFL_ACCESS_STATE_TYPE_CHECKED,
263 efl_ui_nstate_value_get(obj)); 262 efl_ui_nstate_value_get(obj));
264} 263}
265 264
@@ -449,8 +448,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
449 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX) 448 ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX)
450 449
451#include "efl_ui_check.eo.c" 450#include "efl_ui_check.eo.c"
451#include "efl_ui_check_eo.legacy.c"
452 452
453#include "efl_ui_check_legacy.eo.h" 453#include "efl_ui_check_legacy_eo.h"
454#include "efl_ui_check_legacy_part.eo.h" 454#include "efl_ui_check_legacy_part.eo.h"
455 455
456#define MY_CLASS_NAME_LEGACY "elm_check" 456#define MY_CLASS_NAME_LEGACY "elm_check"
@@ -492,13 +492,13 @@ _icon_signal_emit(Evas_Object *obj)
492/* FIXME: replicated from elm_layout just because check's icon spot 492/* FIXME: replicated from elm_layout just because check's icon spot
493 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we 493 * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we
494 * can changed the theme API */ 494 * can changed the theme API */
495EOLIAN static Efl_Ui_Theme_Apply_Result 495EOLIAN static Eina_Error
496_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) 496_efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED)
497{ 497{
498 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 498 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
499 499
500 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); 500 int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS));
501 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 501 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
502 502
503 _icon_signal_emit(obj); 503 _icon_signal_emit(obj);
504 504
@@ -558,4 +558,4 @@ elm_check_add(Evas_Object *parent)
558 return elm_legacy_add(EFL_UI_CHECK_LEGACY_CLASS, parent); 558 return elm_legacy_add(EFL_UI_CHECK_LEGACY_CLASS, parent);
559} 559}
560 560
561#include "efl_ui_check_legacy.eo.c" 561#include "efl_ui_check_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index 19d77613a1..5bd3d187e1 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -7,7 +7,6 @@ class @beta Efl.Ui.Check extends Efl.Ui.Nstate implements Efl.Access.Widget.Acti
7 except they do not work as a group, but independently, and only toggle 7 except they do not work as a group, but independently, and only toggle
8 the value of a boolean between false and true. 8 the value of a boolean between false and true.
9 ]] 9 ]]
10 legacy_prefix: elm_check;
11 methods { 10 methods {
12 @property selected { 11 @property selected {
13 [[The on/off state of the check object.]] 12 [[The on/off state of the check object.]]
@@ -24,7 +23,7 @@ class @beta Efl.Ui.Check extends Efl.Ui.Nstate implements Efl.Access.Widget.Acti
24 Efl.Object.constructor; 23 Efl.Object.constructor;
25 Efl.Ui.Widget.on_access_activate; 24 Efl.Ui.Widget.on_access_activate;
26 Efl.Ui.Widget.theme_apply; 25 Efl.Ui.Widget.theme_apply;
27 Efl.Ui.Widget.widget_event; 26 Efl.Ui.Widget.widget_input_event_handler;
28 Efl.Ui.Nstate.value { set; } 27 Efl.Ui.Nstate.value { set; }
29 Efl.Access.Object.state_set { get; } 28 Efl.Access.Object.state_set { get; }
30 Efl.Access.Widget.Action.elm_actions { get; } 29 Efl.Access.Widget.Action.elm_actions { get; }
diff --git a/src/lib/elementary/efl_ui_check_eo.legacy.c b/src/lib/elementary/efl_ui_check_eo.legacy.c
new file mode 100644
index 0000000000..ea58cc9249
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_eo.legacy.c
@@ -0,0 +1,12 @@
1
2EAPI void
3elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value)
4{
5 efl_ui_check_selected_set(obj, value);
6}
7
8EAPI Eina_Bool
9elm_check_selected_get(const Efl_Ui_Check *obj)
10{
11 return efl_ui_check_selected_get(obj);
12}
diff --git a/src/lib/elementary/efl_ui_check_eo.legacy.h b/src/lib/elementary/efl_ui_check_eo.legacy.h
new file mode 100644
index 0000000000..5b3ade3f2f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_eo.legacy.h
@@ -0,0 +1,38 @@
1#ifndef _EFL_UI_CHECK_EO_LEGACY_H_
2#define _EFL_UI_CHECK_EO_LEGACY_H_
3
4#ifndef _EFL_UI_CHECK_EO_CLASS_TYPE
5#define _EFL_UI_CHECK_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Check;
8
9#endif
10
11#ifndef _EFL_UI_CHECK_EO_TYPES
12#define _EFL_UI_CHECK_EO_TYPES
13
14
15#endif
16
17/**
18 * @brief The on/off state of the check object.
19 *
20 * @param[in] obj The object.
21 * @param[in] value @c true if the check object is selected, @c false otherwise
22 *
23 * @ingroup Elm_Check_Group
24 */
25EAPI void elm_check_selected_set(Efl_Ui_Check *obj, Eina_Bool value);
26
27/**
28 * @brief The on/off state of the check object.
29 *
30 * @param[in] obj The object.
31 *
32 * @return @c true if the check object is selected, @c false otherwise
33 *
34 * @ingroup Elm_Check_Group
35 */
36EAPI Eina_Bool elm_check_selected_get(const Efl_Ui_Check *obj);
37
38#endif
diff --git a/src/lib/elementary/efl_ui_check_legacy.eo b/src/lib/elementary/efl_ui_check_legacy.eo
deleted file mode 100644
index f16ded2435..0000000000
--- a/src/lib/elementary/efl_ui_check_legacy.eo
+++ /dev/null
@@ -1,18 +0,0 @@
1class @beta Efl.Ui.Check_Legacy extends Efl.Ui.Check implements Efl.Ui.Legacy
2{
3 [[Check widget
4
5 The check widget allows for toggling a value between true and false.
6 Check objects are a lot like radio objects in layout and functionality,
7 except they do not work as a group, but independently, and only toggle
8 the value of a boolean between false and true.
9 ]]
10 data: null;
11 implements {
12 class.constructor;
13 Efl.Object.constructor;
14 Efl.Ui.Widget.theme_apply;
15 Efl.Ui.Widget.widget_sub_object_del;
16 Efl.Part.part_get;
17 }
18}
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.c b/src/lib/elementary/efl_ui_check_legacy_eo.c
new file mode 100644
index 0000000000..cd1d466ee9
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.c
@@ -0,0 +1,47 @@
1
2Efl_Object *_efl_ui_check_legacy_efl_object_constructor(Eo *obj, void *pd);
3
4
5Eina_Error _efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *pd);
6
7
8Eina_Bool _efl_ui_check_legacy_efl_ui_widget_widget_sub_object_del(Eo *obj, void *pd, Efl_Canvas_Object *sub_obj);
9
10
11Efl_Object *_efl_ui_check_legacy_efl_part_part_get(const Eo *obj, void *pd, const char *name);
12
13
14static Eina_Bool
15_efl_ui_check_legacy_class_initializer(Efl_Class *klass)
16{
17 const Efl_Object_Ops *opsp = NULL;
18
19 const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
20
21#ifndef EFL_UI_CHECK_LEGACY_EXTRA_OPS
22#define EFL_UI_CHECK_LEGACY_EXTRA_OPS
23#endif
24
25 EFL_OPS_DEFINE(ops,
26 EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_check_legacy_efl_object_constructor),
27 EFL_OBJECT_OP_FUNC(efl_ui_widget_theme_apply, _efl_ui_check_legacy_efl_ui_widget_theme_apply),
28 EFL_OBJECT_OP_FUNC(efl_ui_widget_sub_object_del, _efl_ui_check_legacy_efl_ui_widget_widget_sub_object_del),
29 EFL_OBJECT_OP_FUNC(efl_part_get, _efl_ui_check_legacy_efl_part_part_get),
30 EFL_UI_CHECK_LEGACY_EXTRA_OPS
31 );
32 opsp = &ops;
33
34 return efl_class_functions_set(klass, opsp, ropsp);
35}
36
37static const Efl_Class_Description _efl_ui_check_legacy_class_desc = {
38 EO_VERSION,
39 "Efl.Ui.Check_Legacy",
40 EFL_CLASS_TYPE_REGULAR,
41 0,
42 _efl_ui_check_legacy_class_initializer,
43 _efl_ui_check_legacy_class_constructor,
44 NULL
45};
46
47EFL_DEFINE_CLASS(efl_ui_check_legacy_class_get, &_efl_ui_check_legacy_class_desc, EFL_UI_CHECK_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.h b/src/lib/elementary/efl_ui_check_legacy_eo.h
new file mode 100644
index 0000000000..a8fb7f50e6
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.h
@@ -0,0 +1,32 @@
1#ifndef _EFL_UI_CHECK_LEGACY_EO_H_
2#define _EFL_UI_CHECK_LEGACY_EO_H_
3
4#ifndef _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Check_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_CHECK_LEGACY_EO_TYPES
12#define _EFL_UI_CHECK_LEGACY_EO_TYPES
13
14
15#endif
16#ifdef EFL_BETA_API_SUPPORT
17/**
18 * @brief Check widget
19 *
20 * The check widget allows for toggling a value between true and false. Check
21 * objects are a lot like radio objects in layout and functionality, except
22 * they do not work as a group, but independently, and only toggle the value of
23 * a boolean between false and true.
24 *
25 * @ingroup Efl_Ui_Check_Legacy
26 */
27#define EFL_UI_CHECK_LEGACY_CLASS efl_ui_check_legacy_class_get()
28
29EWAPI const Efl_Class *efl_ui_check_legacy_class_get(void);
30#endif /* EFL_BETA_API_SUPPORT */
31
32#endif
diff --git a/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h
new file mode 100644
index 0000000000..efe4b009b3
--- /dev/null
+++ b/src/lib/elementary/efl_ui_check_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
1#ifndef _EFL_UI_CHECK_LEGACY_EO_LEGACY_H_
2#define _EFL_UI_CHECK_LEGACY_EO_LEGACY_H_
3
4#ifndef _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
5#define _EFL_UI_CHECK_LEGACY_EO_CLASS_TYPE
6
7typedef Eo Efl_Ui_Check_Legacy;
8
9#endif
10
11#ifndef _EFL_UI_CHECK_LEGACY_EO_TYPES
12#define _EFL_UI_CHECK_LEGACY_EO_TYPES
13
14
15#endif
16
17#endif
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 528e1f4727..5c83d83774 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -496,23 +496,6 @@ _efl_ui_clock_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Clock_Data *sd
496 return EINA_TRUE; 496 return EINA_TRUE;
497} 497}
498 498
499EOLIAN static Eina_Bool
500_efl_ui_clock_efl_ui_widget_on_disabled_update(Eo *obj, Efl_Ui_Clock_Data *sd, Eina_Bool disabled)
501{
502 Clock_Field *field;
503 unsigned int idx = 0;
504
505 if (!efl_ui_widget_on_disabled_update(efl_super(obj, MY_CLASS), disabled))
506 return EINA_FALSE;
507
508 for (idx = 0; idx < EFL_UI_CLOCK_TYPE_COUNT; idx++)
509 {
510 field = sd->field_list + idx;
511 elm_object_disabled_set(field->item_obj, disabled);
512 }
513 return EINA_TRUE;
514}
515
516EOLIAN static void 499EOLIAN static void
517_efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd) 500_efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
518{ 501{
@@ -531,10 +514,10 @@ _efl_ui_clock_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Clock_Data *sd)
531 evas_object_size_hint_max_set(obj, -1, -1); 514 evas_object_size_hint_max_set(obj, -1, -1);
532} 515}
533 516
534EOLIAN static Efl_Ui_Theme_Apply_Result 517EOLIAN static Eina_Error
535_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd) 518_efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
536{ 519{
537 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 520 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
538 521
539 Clock_Field *field; 522 Clock_Field *field;
540 char buf[BUFFER_SIZE]; 523 char buf[BUFFER_SIZE];
@@ -544,7 +527,7 @@ _efl_ui_clock_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Clock_Data *sd)
544 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 527 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
545 528
546 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 529 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
547 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 530 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
548 531
549 dt_mod = _dt_mod_init(); 532 dt_mod = _dt_mod_init();
550 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE; 533 if ((!dt_mod) || (!dt_mod->field_value_display)) return EINA_TRUE;
@@ -874,10 +857,10 @@ _efl_ui_clock_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Clock_Data *priv)
874 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 857 efl_canvas_group_add(efl_super(obj, MY_CLASS));
875 elm_widget_sub_object_parent_add(obj); 858 elm_widget_sub_object_parent_add(obj);
876 859
877 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 860 if (elm_widget_theme_object_set(obj, wd->resize_obj,
878 elm_widget_theme_klass_get(obj), 861 elm_widget_theme_klass_get(obj),
879 elm_widget_theme_element_get(obj), 862 elm_widget_theme_element_get(obj),
880 elm_widget_theme_style_get(obj))) 863 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
881 CRI("Failed to set layout!"); 864 CRI("Failed to set layout!");
882 865
883 // module - initialise module for clock 866 // module - initialise module for clock
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 767f8b2b7d..7f8486684a 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
16 ampm = 7, [[Indicates AM/PM field .]] 16 ampm = 7, [[Indicates AM/PM field .]]
17} 17}
18 18
19class @beta Efl.Ui.Clock extends Efl.Ui.Layout 19class @beta Efl.Ui.Clock extends Efl.Ui.Layout_Base
20{ 20{
21 [[Efl UI clock class]] 21 [[Efl UI clock class]]
22 methods { 22 methods {
@@ -224,7 +224,6 @@ class @beta Efl.Ui.Clock extends Efl.Ui.Layout
224 implements { 224 implements {
225 Efl.Object.constructor; 225 Efl.Object.constructor;
226 Efl.Ui.Widget.theme_apply; 226 Efl.Ui.Widget.theme_apply;
227 Efl.Ui.Widget.on_disabled_update;
228 Efl.Ui.Focus.Object.on_focus_update; 227 Efl.Ui.Focus.Object.on_focus_update;
229 Efl.Ui.L10n.translation_update; 228 Efl.Ui.L10n.translation_update;
230 } 229 }
diff --git a/src/lib/elementary/efl_ui_container_layout.c b/src/lib/elementary/efl_ui_container_layout.c
new file mode 100644
index 0000000000..e8c5979dd0
--- /dev/null
+++ b/src/lib/elementary/efl_ui_container_layout.c
@@ -0,0 +1,158 @@
1#include "efl_ui_container_layout.h"
2
3void
4_efl_ui_container_layout_min_max_calc(Efl_Ui_Container_Item_Hints *item, int *cw, int *ch, Eina_Bool aspect_check)
5{
6 int w = *cw, h = *ch;
7 Eina_Size2D aspect = { item[0].aspect, item[1].aspect };
8
9 if (aspect_check)
10 {
11 w = h * aspect.w / aspect.h;
12 if (w > *cw)
13 {
14 w = *cw;
15 h = w * aspect.h / aspect.w;
16 }
17 }
18
19 if (w > item[0].max)
20 {
21 w = item[0].max;
22 if (aspect_check) h = w * aspect.h / aspect.w;
23 }
24 if (h > item[1].max)
25 {
26 h = item[1].max;
27 if (aspect_check) w = h * aspect.w / aspect.h;
28 }
29 if (w < item[0].min)
30 {
31 w = item[0].min;
32 if (aspect_check) h = w * aspect.h / aspect.w;
33 }
34 if (h < item[1].min)
35 {
36 h = item[1].min;
37 if (aspect_check) w = h * aspect.w / aspect.h;
38 }
39 *cw = w;
40 *ch = h;
41}
42
43void
44_efl_ui_container_layout_item_init(Eo* o, Efl_Ui_Container_Item_Hints *item)
45{
46 Eina_Size2D max;
47 Eina_Size2D min;
48 Eina_Size2D aspect;
49 Efl_Gfx_Hint_Aspect aspect_type;
50
51 efl_gfx_hint_weight_get(o, &item[0].weight, &item[1].weight);
52 efl_gfx_hint_align_get(o, &item[0].align, &item[1].align);
53 efl_gfx_hint_margin_get(o, &item[0].margin[0], &item[0].margin[1],
54 &item[1].margin[0], &item[1].margin[1]);
55 efl_gfx_hint_fill_get(o, &item[0].fill, &item[1].fill);
56 max = efl_gfx_hint_size_max_get(o);
57 min = efl_gfx_hint_size_combined_min_get(o);
58 efl_gfx_hint_aspect_get(o, &aspect_type, &aspect);
59 item[0].aspect = aspect.w;
60 item[1].aspect = aspect.h;
61 item[0].aspect_type = aspect_type;
62 item[1].aspect_type = aspect_type;
63
64 if (EINA_DBL_EQ(item[0].align, -1))
65 {
66 item[0].align = 0.5;
67 item[0].fill = EINA_TRUE;
68 }
69 else if (item[0].align < 0) item[0].align = 0;
70 else if (item[0].align > 1) item[0].align = 1;
71 if (EINA_DBL_EQ(item[1].align, -1))
72 {
73 item[1].align = 0.5;
74 item[1].fill = EINA_TRUE;
75 }
76 else if (item[1].align < 0) item[1].align = 0;
77 else if (item[1].align > 1) item[1].align = 1;
78
79 if (min.w < 0) min.w = 0;
80 if (min.h < 0) min.h = 0;
81
82 if (max.w < 0) max.w = INT_MAX;
83 if (max.h < 0) max.h = INT_MAX;
84
85 item[0].max = max.w;
86 item[1].max = max.h;
87 item[0].min = min.w;
88 item[1].min = min.h;
89
90 if ((item[0].aspect <= 0) || (item[1].aspect_type <= 0))
91 {
92 if ((item[0].aspect <= 0) ^ (item[1].aspect_type <= 0))
93 {
94 ERR("Invalid aspect parameter for obj(%p)", o);
95 item[0].aspect = item[1].aspect_type = 0;
96 item[0].aspect_type = item[1].aspect_type = EFL_GFX_HINT_ASPECT_NONE;
97 }
98 }
99 else
100 {
101 _efl_ui_container_layout_min_max_calc(item, &item[0].min, &item[1].min,
102 EINA_TRUE);
103 }
104
105
106 item[0].space = item[0].min + item[0].margin[0] + item[0].margin[1];
107 item[1].space = item[1].min + item[1].margin[0] + item[1].margin[1];
108}
109
110void
111_efl_ui_container_layout_init(Eo* obj, Efl_Ui_Container_Layout_Calc *calc)
112{
113 Eina_Rect geom;
114 Eina_Bool pad_scalable;
115
116 geom = efl_gfx_entity_geometry_get(obj);
117 efl_gfx_hint_margin_get(obj, &calc[0].margin[0], &calc[0].margin[1],
118 &calc[1].margin[0], &calc[1].margin[1]);
119 calc[0].scale = calc[1].scale = efl_gfx_entity_scale_get(obj);
120
121 efl_pack_padding_get(obj, &calc[0].pad, &calc[1].pad, &pad_scalable);
122 calc[0].pad = pad_scalable ? (calc[0].pad * calc[0].scale) : calc[0].pad;
123 calc[1].pad = pad_scalable ? (calc[1].pad * calc[1].scale) : calc[1].pad;
124
125 // pack align is used if "no item has a weight"
126 efl_pack_align_get(obj, &calc[0].align, &calc[1].align);
127 if (calc[0].align < 0)
128 {
129 calc[0].fill = EINA_TRUE;
130 calc[0].align = 0.5;
131 }
132 else if (calc[0].align > 1)
133 {
134 calc[0].align = 1;
135 }
136 else
137 {
138 calc[0].fill = EINA_FALSE;
139 }
140
141 if (calc[1].align < 0)
142 {
143 calc[1].fill = EINA_TRUE;
144 calc[1].align = 0.5;
145 }
146 else if (calc[1].align > 1)
147 {
148 calc[1].align = 1;
149 }
150 else
151 {
152 calc[1].fill = EINA_FALSE;
153 }
154 calc[0].pos = geom.x + calc[0].margin[0];
155 calc[1].pos = geom.y + calc[1].margin[0];
156 calc[0].size = geom.w - calc[0].margin[0] - calc[0].margin[1];
157 calc[1].size = geom.h - calc[1].margin[0] - calc[1].margin[1];
158}
diff --git a/src/lib/elementary/efl_ui_container_layout.h b/src/lib/elementary/efl_ui_container_layout.h
new file mode 100644
index 0000000000..097abee13b
--- /dev/null
+++ b/src/lib/elementary/efl_ui_container_layout.h
@@ -0,0 +1,42 @@
1#ifndef _EFL_UI_CONTAINER_HELPER_H_
2#define _EFL_UI_CONTAINER_HELPER_H_
3
4#ifdef HAVE_CONFIG_H
5# include "elementary_config.h"
6#endif
7
8#include <Elementary.h>
9#include "elm_priv.h"
10
11typedef struct _Efl_Ui_Container_Item_Hints Efl_Ui_Container_Item_Hints;
12typedef struct _Efl_Ui_Container_Layout_Calc Efl_Ui_Container_Layout_Calc;
13
14struct _Efl_Ui_Container_Item_Hints
15{
16 int max;
17 int min;
18 int aspect;
19 int margin[2]; // start, end
20 Efl_Gfx_Hint_Aspect aspect_type;
21 double weight;
22 double align;
23 double space;
24 Eina_Bool fill;
25};
26
27struct _Efl_Ui_Container_Layout_Calc
28{
29 int pos;
30 int size;
31 int margin[2];
32 double align;
33 double scale;
34 double pad;
35 Eina_Bool fill : 1;
36};
37
38void _efl_ui_container_layout_min_max_calc(Efl_Ui_Container_Item_Hints *item, int *cw, int *ch, Eina_Bool aspect_check);
39void _efl_ui_container_layout_item_init(Eo* o, Efl_Ui_Container_Item_Hints *item);
40void _efl_ui_container_layout_init(Eo* obj, Efl_Ui_Container_Layout_Calc *calc);
41
42#endif
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 493dbfa674..872f67b90a 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -244,10 +244,10 @@ _efl_ui_datepicker_efl_object_constructor(Eo *obj, Efl_Ui_Datepicker_Data *pd)
244 elm_widget_theme_klass_set(obj, "datepicker"); 244 elm_widget_theme_klass_set(obj, "datepicker");
245 obj = efl_constructor(efl_super(obj, MY_CLASS)); 245 obj = efl_constructor(efl_super(obj, MY_CLASS));
246 246
247 if (!elm_widget_theme_object_set(obj, wd->resize_obj, 247 if (elm_widget_theme_object_set(obj, wd->resize_obj,
248 elm_widget_theme_klass_get(obj), 248 elm_widget_theme_klass_get(obj),
249 elm_widget_theme_element_get(obj), 249 elm_widget_theme_element_get(obj),
250 elm_widget_theme_style_get(obj))) 250 elm_widget_theme_style_get(obj)) == EFL_UI_THEME_APPLY_ERROR_GENERIC)
251 CRI("Failed to set layout!"); 251 CRI("Failed to set layout!");
252 252
253 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj); 253 pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj);
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 4225c28e75..93e7632023 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout 1class @beta Efl.Ui.Datepicker extends Efl.Ui.Layout_Base
2{ 2{
3 [[Datepicker widget 3 [[Datepicker widget
4 4
diff --git a/src/lib/elementary/efl_ui_dnd_container.eo b/src/lib/elementary/efl_ui_dnd_container.eo
index 05eccfeef8..0cc1f3f945 100644
--- a/src/lib/elementary/efl_ui_dnd_container.eo
+++ b/src/lib/elementary/efl_ui_dnd_container.eo
@@ -5,10 +5,8 @@ mixin @beta Efl.Ui.Dnd_Container {
5 @property drag_delay_time { 5 @property drag_delay_time {
6 [[The time since mouse down happens to drag starts.]] 6 [[The time since mouse down happens to drag starts.]]
7 set { 7 set {
8 legacy: null;
9 } 8 }
10 get { 9 get {
11 legacy: null;
12 } 10 }
13 values { 11 values {
14 time: double; [[The drag delay time]] 12 time: double; [[The drag delay time]]
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 7f3238e9bf..7f3da3c31a 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -97,12 +97,12 @@ _sizing_eval(Evas_Object *obj)
97 evas_object_size_hint_max_set(obj, maxw, maxh); 97 evas_object_size_hint_max_set(obj, maxw, maxh);
98} 98}
99 99
100EOLIAN static Efl_Ui_Theme_Apply_Result 100EOLIAN static Eina_Error
101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED) 101_efl_ui_flip_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Flip_Data *sd EINA_UNUSED)
102{ 102{
103 Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; 103 Eina_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC;
104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 104 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
105 if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; 105 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
106 106
107 _sizing_eval(obj); 107 _sizing_eval(obj);
108 108
@@ -1959,7 +1959,7 @@ _internal_elm_flip_go_to(Evas_Object *obj,
1959} 1959}
1960 1960
1961EOLIAN static void 1961EOLIAN static void
1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Elm_Flip_Mode mode) 1962_efl_ui_flip_go_to(Eo *obj, Efl_Ui_Flip_Data *sd, Eina_Bool front, Efl_Ui_Flip_Mode mode)
1963{ 1963{
1964