aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/themes/edc/elm/button.edc6
-rw-r--r--data/themes/edc/elm/label.edc80
-rw-r--r--doc/index.doxy166
-rw-r--r--src/bin/test_application_server.c4
-rw-r--r--src/bin/test_focus.c96
-rw-r--r--src/bin/test_systray.c2
-rw-r--r--src/bin/test_task_switcher.c2
-rw-r--r--src/examples/evas3d_map_example.c36
-rw-r--r--src/examples/evas3d_object_on_button_example.c28
-rw-r--r--src/examples/evas3d_scene_on_button_example.c26
-rw-r--r--src/examples/filemvc.c10
-rw-r--r--src/examples/fileviewlist.c4
-rw-r--r--src/examples/performance/graphical.c37
-rw-r--r--src/examples/performance/performance.c3
-rw-r--r--src/examples/sphere_hunter/evas_3d_sphere_hunter.c34
-rw-r--r--src/lib/elc_combobox.c13
-rw-r--r--src/lib/elc_combobox.h2
-rw-r--r--src/lib/elc_combobox_legacy.h2
-rw-r--r--src/lib/elc_ctxpopup.c7
-rw-r--r--src/lib/elc_ctxpopup.h2
-rw-r--r--src/lib/elc_ctxpopup_legacy.h2
-rw-r--r--src/lib/elc_fileselector.c3
-rw-r--r--src/lib/elc_fileselector.h4
-rw-r--r--src/lib/elc_fileselector_button.c3
-rw-r--r--src/lib/elc_fileselector_button.h2
-rw-r--r--src/lib/elc_fileselector_button_legacy.h2
-rw-r--r--src/lib/elc_fileselector_entry.c3
-rw-r--r--src/lib/elc_fileselector_entry.h2
-rw-r--r--src/lib/elc_fileselector_entry_legacy.h2
-rw-r--r--src/lib/elc_fileselector_eo.h2
-rw-r--r--src/lib/elc_fileselector_legacy.h50
-rw-r--r--src/lib/elc_hoversel.c6
-rw-r--r--src/lib/elc_hoversel.h2
-rw-r--r--src/lib/elc_hoversel_legacy.h2
-rw-r--r--src/lib/elc_multibuttonentry.c5
-rw-r--r--src/lib/elc_naviframe.c5
-rw-r--r--src/lib/elc_naviframe.h4
-rw-r--r--src/lib/elc_naviframe_common.h2
-rw-r--r--src/lib/elc_naviframe_eo.h2
-rw-r--r--src/lib/elc_player.c3
-rw-r--r--src/lib/elc_popup.c5
-rw-r--r--src/lib/elc_popup.h2
-rw-r--r--src/lib/elc_popup_eo.h2
-rw-r--r--src/lib/elc_popup_legacy.h2
-rw-r--r--src/lib/elm_access.c3
-rw-r--r--src/lib/elm_actionslider.c3
-rw-r--r--src/lib/elm_actionslider.h2
-rw-r--r--src/lib/elm_actionslider_legacy.h4
-rw-r--r--src/lib/elm_app.h36
-rw-r--r--src/lib/elm_app_client.c4
-rw-r--r--src/lib/elm_app_server.c2
-rw-r--r--src/lib/elm_atspi_bridge.c2
-rw-r--r--src/lib/elm_bg.c3
-rw-r--r--src/lib/elm_bg.h2
-rw-r--r--src/lib/elm_bg_legacy.h10
-rw-r--r--src/lib/elm_box.c3
-rw-r--r--src/lib/elm_box.h2
-rw-r--r--src/lib/elm_box_common.h2
-rw-r--r--src/lib/elm_box_legacy.h2
-rw-r--r--src/lib/elm_bubble.c3
-rw-r--r--src/lib/elm_bubble.h2
-rw-r--r--src/lib/elm_bubble_legacy.h2
-rw-r--r--src/lib/elm_button.c3
-rw-r--r--src/lib/elm_button.h4
-rw-r--r--src/lib/elm_button_legacy.h4
-rw-r--r--src/lib/elm_cache.h4
-rw-r--r--src/lib/elm_calendar.c3
-rw-r--r--src/lib/elm_calendar.h4
-rw-r--r--src/lib/elm_calendar_common.h2
-rw-r--r--src/lib/elm_calendar_legacy.h2
-rw-r--r--src/lib/elm_check.c3
-rw-r--r--src/lib/elm_check.h2
-rw-r--r--src/lib/elm_check_legacy.h2
-rw-r--r--src/lib/elm_clock.c3
-rw-r--r--src/lib/elm_clock.h4
-rw-r--r--src/lib/elm_clock_legacy.h2
-rw-r--r--src/lib/elm_color_class.h2
-rw-r--r--src/lib/elm_colorselector.c7
-rw-r--r--src/lib/elm_colorselector.h2
-rw-r--r--src/lib/elm_colorselector_common.h2
-rw-r--r--src/lib/elm_colorselector_legacy.h2
-rw-r--r--src/lib/elm_config.c5
-rw-r--r--src/lib/elm_config.h226
-rw-r--r--src/lib/elm_conform.c3
-rw-r--r--src/lib/elm_conform.h4
-rw-r--r--src/lib/elm_conform_eo.h2
-rw-r--r--src/lib/elm_conform_legacy.h2
-rw-r--r--src/lib/elm_cursor.h16
-rw-r--r--src/lib/elm_datetime.c3
-rw-r--r--src/lib/elm_datetime.h4
-rw-r--r--src/lib/elm_datetime_common.h2
-rw-r--r--src/lib/elm_datetime_legacy.h2
-rw-r--r--src/lib/elm_dayselector.c6
-rw-r--r--src/lib/elm_dayselector.h4
-rw-r--r--src/lib/elm_dayselector_legacy.h2
-rw-r--r--src/lib/elm_debug.h6
-rw-r--r--src/lib/elm_deprecated.h130
-rw-r--r--src/lib/elm_diskselector.c6
-rw-r--r--src/lib/elm_diskselector.h4
-rw-r--r--src/lib/elm_diskselector_legacy.h2
-rw-r--r--src/lib/elm_entry.c29
-rw-r--r--src/lib/elm_entry.eo27
-rw-r--r--src/lib/elm_entry.h2
-rw-r--r--src/lib/elm_entry_common.h2
-rw-r--r--src/lib/elm_entry_legacy.h39
-rw-r--r--src/lib/elm_finger.h4
-rw-r--r--src/lib/elm_flip.c3
-rw-r--r--src/lib/elm_flip.h2
-rw-r--r--src/lib/elm_flip_legacy.h4
-rw-r--r--src/lib/elm_flipselector.c5
-rw-r--r--src/lib/elm_flipselector.h4
-rw-r--r--src/lib/elm_flipselector_legacy.h2
-rw-r--r--src/lib/elm_focus.h74
-rw-r--r--src/lib/elm_focus_item.h6
-rw-r--r--src/lib/elm_font.h14
-rw-r--r--src/lib/elm_frame.c3
-rw-r--r--src/lib/elm_frame.h2
-rw-r--r--src/lib/elm_frame_legacy.h2
-rw-r--r--src/lib/elm_general.h20
-rw-r--r--src/lib/elm_gengrid.c8
-rw-r--r--src/lib/elm_gengrid.h4
-rw-r--r--src/lib/elm_gengrid_common.h38
-rw-r--r--src/lib/elm_gengrid_eo.h2
-rw-r--r--src/lib/elm_gengrid_legacy.h10
-rw-r--r--src/lib/elm_genlist.c12
-rw-r--r--src/lib/elm_genlist.h4
-rw-r--r--src/lib/elm_genlist_common.h32
-rw-r--r--src/lib/elm_genlist_eo.h2
-rw-r--r--src/lib/elm_genlist_item.eo2
-rw-r--r--src/lib/elm_genlist_legacy.h2
-rw-r--r--src/lib/elm_gesture_layer.c3
-rw-r--r--src/lib/elm_getting_started.h2
-rw-r--r--src/lib/elm_glview.c6
-rw-r--r--src/lib/elm_glview.h4
-rw-r--r--src/lib/elm_glview_common.h2
-rw-r--r--src/lib/elm_glview_legacy.h64
-rw-r--r--src/lib/elm_grid.c3
-rw-r--r--src/lib/elm_grid.h2
-rw-r--r--src/lib/elm_grid_eo.h2
-rw-r--r--src/lib/elm_grid_legacy.h6
-rw-r--r--src/lib/elm_hover.c3
-rw-r--r--src/lib/elm_hover.h2
-rw-r--r--src/lib/elm_hover_legacy.h6
-rw-r--r--src/lib/elm_icon.c3
-rw-r--r--src/lib/elm_icon.h2
-rw-r--r--src/lib/elm_icon_legacy.h2
-rw-r--r--src/lib/elm_image.c133
-rw-r--r--src/lib/elm_image.eo41
-rw-r--r--src/lib/elm_image.h4
-rw-r--r--src/lib/elm_image_eo.h2
-rw-r--r--src/lib/elm_image_legacy.h82
-rw-r--r--src/lib/elm_index.c5
-rw-r--r--src/lib/elm_index.h4
-rw-r--r--src/lib/elm_index_eo.h2
-rw-r--r--src/lib/elm_index_legacy.h2
-rw-r--r--src/lib/elm_interface_atspi_accessible.c2
-rw-r--r--src/lib/elm_interface_scrollable.c4
-rw-r--r--src/lib/elm_inwin.c3
-rw-r--r--src/lib/elm_inwin.h4
-rw-r--r--src/lib/elm_inwin_legacy.h8
-rw-r--r--src/lib/elm_label.c3
-rw-r--r--src/lib/elm_label.h2
-rw-r--r--src/lib/elm_label_eo.h2
-rw-r--r--src/lib/elm_label_legacy.h2
-rw-r--r--src/lib/elm_layout.c3
-rw-r--r--src/lib/elm_layout.h2
-rw-r--r--src/lib/elm_layout_common.h2
-rw-r--r--src/lib/elm_layout_eo.h2
-rw-r--r--src/lib/elm_layout_legacy.h14
-rw-r--r--src/lib/elm_list.c6
-rw-r--r--src/lib/elm_list.h4
-rw-r--r--src/lib/elm_list_eo.h2
-rw-r--r--src/lib/elm_list_legacy.h2
-rw-r--r--src/lib/elm_main.c14
-rw-r--r--src/lib/elm_map.c5
-rw-r--r--src/lib/elm_map.h2
-rw-r--r--src/lib/elm_map_common.h2
-rw-r--r--src/lib/elm_map_legacy.h2
-rw-r--r--src/lib/elm_mapbuf.c3
-rw-r--r--src/lib/elm_mapbuf.h4
-rw-r--r--src/lib/elm_mapbuf_eo.h2
-rw-r--r--src/lib/elm_mapbuf_legacy.h2
-rw-r--r--src/lib/elm_menu.c7
-rw-r--r--src/lib/elm_menu.h2
-rw-r--r--src/lib/elm_menu_legacy.h6
-rw-r--r--src/lib/elm_mirroring.h10
-rw-r--r--src/lib/elm_need.h4
-rw-r--r--src/lib/elm_notify.c3
-rw-r--r--src/lib/elm_notify.h2
-rw-r--r--src/lib/elm_notify_eo.h2
-rw-r--r--src/lib/elm_notify_legacy.h6
-rw-r--r--src/lib/elm_object.h56
-rw-r--r--src/lib/elm_object_item.h10
-rw-r--r--src/lib/elm_panel.c3
-rw-r--r--src/lib/elm_panel.h2
-rw-r--r--src/lib/elm_panel_common.h2
-rw-r--r--src/lib/elm_panel_legacy.h2
-rw-r--r--src/lib/elm_panes.c3
-rw-r--r--src/lib/elm_panes.h4
-rw-r--r--src/lib/elm_panes_legacy.h2
-rw-r--r--src/lib/elm_photo.c20
-rw-r--r--src/lib/elm_photo.eo18
-rw-r--r--src/lib/elm_photo.h2
-rw-r--r--src/lib/elm_photo_eo.h2
-rw-r--r--src/lib/elm_photo_legacy.h25
-rw-r--r--src/lib/elm_photocam.c5
-rw-r--r--src/lib/elm_photocam.h2
-rw-r--r--src/lib/elm_photocam_legacy.h8
-rw-r--r--src/lib/elm_plug.c3
-rw-r--r--src/lib/elm_prefs.c3
-rw-r--r--src/lib/elm_prefs.h2
-rw-r--r--src/lib/elm_prefs_common.h2
-rw-r--r--src/lib/elm_prefs_eo.h2
-rw-r--r--src/lib/elm_prefs_legacy.h2
-rw-r--r--src/lib/elm_priv.h1
-rw-r--r--src/lib/elm_progressbar.c3
-rw-r--r--src/lib/elm_progressbar.h2
-rw-r--r--src/lib/elm_progressbar_common.h2
-rw-r--r--src/lib/elm_progressbar_legacy.h2
-rw-r--r--src/lib/elm_radio.c3
-rw-r--r--src/lib/elm_radio.h2
-rw-r--r--src/lib/elm_radio_legacy.h2
-rw-r--r--src/lib/elm_removed.h168
-rw-r--r--src/lib/elm_route.c5
-rw-r--r--src/lib/elm_route.h2
-rw-r--r--src/lib/elm_route_legacy.h2
-rw-r--r--src/lib/elm_scale.h6
-rw-r--r--src/lib/elm_scroll.h22
-rw-r--r--src/lib/elm_scroller.c3
-rw-r--r--src/lib/elm_scroller.h2
-rw-r--r--src/lib/elm_scroller_eo.h2
-rw-r--r--src/lib/elm_scroller_legacy.h64
-rw-r--r--src/lib/elm_segment_control.c5
-rw-r--r--src/lib/elm_segment_control.h4
-rw-r--r--src/lib/elm_segment_control_legacy.h2
-rw-r--r--src/lib/elm_separator.c3
-rw-r--r--src/lib/elm_separator.h2
-rw-r--r--src/lib/elm_separator_legacy.h2
-rw-r--r--src/lib/elm_slider.c3
-rw-r--r--src/lib/elm_slider.h4
-rw-r--r--src/lib/elm_slider_common.h2
-rw-r--r--src/lib/elm_slider_legacy.h2
-rw-r--r--src/lib/elm_slideshow.c7
-rw-r--r--src/lib/elm_slideshow.h4
-rw-r--r--src/lib/elm_slideshow_common.h2
-rw-r--r--src/lib/elm_slideshow_legacy.h2
-rw-r--r--src/lib/elm_spinner.c3
-rw-r--r--src/lib/elm_spinner.h4
-rw-r--r--src/lib/elm_spinner_legacy.h6
-rw-r--r--src/lib/elm_sys_notify.c4
-rw-r--r--src/lib/elm_table.c3
-rw-r--r--src/lib/elm_table.h2
-rw-r--r--src/lib/elm_table_legacy.h6
-rw-r--r--src/lib/elm_theme.h64
-rw-r--r--src/lib/elm_thumb.c26
-rw-r--r--src/lib/elm_thumb.eo25
-rw-r--r--src/lib/elm_thumb.h4
-rw-r--r--src/lib/elm_thumb_common.h2
-rw-r--r--src/lib/elm_thumb_legacy.h29
-rw-r--r--src/lib/elm_toolbar.c6
-rw-r--r--src/lib/elm_toolbar.h4
-rw-r--r--src/lib/elm_toolbar_common.h2
-rw-r--r--src/lib/elm_toolbar_eo.h2
-rw-r--r--src/lib/elm_toolbar_legacy.h10
-rw-r--r--src/lib/elm_tooltip.h32
-rw-r--r--src/lib/elm_transit.h90
-rw-r--r--src/lib/elm_video.c3
-rw-r--r--src/lib/elm_video.h4
-rw-r--r--src/lib/elm_video_legacy.h8
-rw-r--r--src/lib/elm_web.h10
-rw-r--r--src/lib/elm_web2.c18
-rw-r--r--src/lib/elm_web_common.h2
-rw-r--r--src/lib/elm_web_legacy.h6
-rw-r--r--src/lib/elm_widget.c101
-rw-r--r--src/lib/elm_widget.eo12
-rw-r--r--src/lib/elm_widget.h4
-rw-r--r--src/lib/elm_widget_container.h4
-rw-r--r--src/lib/elm_widget_flipselector.h4
-rw-r--r--src/lib/elm_win.c16
-rw-r--r--src/lib/elm_win.h2
-rw-r--r--src/lib/elm_win_common.h2
-rw-r--r--src/lib/elm_win_eo.h2
-rw-r--r--src/lib/elm_win_legacy.h28
-rw-r--r--src/lib/elm_win_standard.c3
-rw-r--r--src/lib/els_cursor.c2
-rw-r--r--src/lib/els_tooltip.c2
-rw-r--r--src/modules/access_output/mod.c14
-rw-r--r--src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c14
-rw-r--r--src/modules/test_entry/mod.c14
-rw-r--r--src/modules/web/none/elm_web_none.c3
-rw-r--r--src/modules/web/webkit2/elm_web_webkit2.c3
-rw-r--r--src/tests/elm_test_atspi.c21
292 files changed, 1875 insertions, 1410 deletions
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index d6cfb08..028b29a 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -91,13 +91,11 @@ group { name: "elm/button/base/default";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -470,14 +468,12 @@ group { name: "elm/button/base/anchor";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"bar", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"bar", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
@@ -1089,13 +1085,11 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
diff --git a/data/themes/edc/elm/label.edc b/data/themes/edc/elm/label.edc
index e684e0c..b1e273b 100644
--- a/data/themes/edc/elm/label.edc
+++ b/data/themes/edc/elm/label.edc
@@ -32,6 +32,40 @@ group { name: "elm/label/base/default";
}
}
+group { name: "elm/label/base/default/left";
+ inherit: "elm/label/base/default";
+ styles {
+ style { name: "label_style_left";
+ base: "font="FN" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+ tag: "br" "\n";
+ tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
+ parts {
+ textblock { "elm.text";
+ desc { "default"; text.style: "label_style_left"; }
+ }
+ }
+}
+
+group { name: "elm/label/base/default/right";
+ inherit: "elm/label/base/default";
+ styles {
+ style { name: "label_style_right";
+ base: "font="FN" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+ tag: "br" "\n";
+ tag: "b" "+ font="FNBD" text_class=tb_light";
+ ENABLED_TEXTBLOCK_TAGS
+ }
+ }
+ parts {
+ textblock { "elm.text";
+ desc { "default"; text.style: "label_style_right"; }
+ }
+ }
+}
+
group { name: "elm/label/base/marker";
inherit: "elm/label/base/default";
styles {
@@ -55,6 +89,52 @@ group { name: "elm/label/base/marker";
}
}
+group { "elm/label/base/marker/left";
+ inherit: "elm/label/base/default";
+ styles {
+ style { name: "label_style3";
+ base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+ tag: "br" "\n";
+ tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
+ tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
+ }
+ }
+ parts {
+ part { name: "elm.text"; type: TEXTBLOCK;
+ scale: 1;
+ description { state: "default" 0.0;
+ text { style: "label_style3";
+ min: 1 1;
+ ellipsis: -1;
+ }
+ }
+ }
+ }
+}
+
+group { "elm/label/base/marker/right";
+ inherit: "elm/label/base/default";
+ styles {
+ style { name: "label_style4";
+ base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+ tag: "br" "\n";
+ tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
+ tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
+ }
+ }
+ parts {
+ part { name: "elm.text"; type: TEXTBLOCK;
+ scale: 1;
+ description { state: "default" 0.0;
+ text { style: "label_style4";
+ min: 1 1;
+ ellipsis: -1;
+ }
+ }
+ }
+ }
+}
+
group { name: "elm/label/base/slide_long";
inherit: "elm/label/base/default";
script {
diff --git a/doc/index.doxy b/doc/index.doxy
index f20bb0a..1ac6e76 100644
--- a/doc/index.doxy
+++ b/doc/index.doxy
@@ -4,29 +4,29 @@
* Elementary is mostly composed of widgets, but it also contains some
* infrastructure modules that facilitate the use of widgets. These are the
* infrastructure modules:
- * @li @ref App
- * @li @ref Caches
- * @li @ref Cursors
- * @li @ref Debug
- * @li @ref Config
- * @li @ref Engine
- * @li @ref Fonts
- * @li @ref Profile
- * @li @ref Fingers
- * @li @ref Focus
- * @li @ref General
+ * @li @ref Elm_App
+ * @li @ref Elm_Caches
+ * @li @ref Elm_Cursors
+ * @li @ref Elm_Debug
+ * @li @ref Elm_Config
+ * @li @ref Elm_Engine
+ * @li @ref Elm_Fonts
+ * @li @ref Elm_Profile
+ * @li @ref Elm_Fingers
+ * @li @ref Elm_Focus
+ * @li @ref Elm_General
* @li @ref Elm_Gesture_Layer
- * @li @ref Password_last_show
+ * @li @ref Elm_Password_last_show
* @li @ref elm-prefs-data
- * @li @ref Start
- * @li @ref Scrolling
- * @li @ref Scrollhints
- * @li @ref Mirroring
- * @li @ref Scaling
- * @li @ref Styles
- * @li @ref Theme
- * @li @ref Transit
- * @li @ref WidgetNavigation
+ * @li @ref Elm_Start
+ * @li @ref Elm_Scrolling
+ * @li @ref Elm_Scrollhints
+ * @li @ref Elm_Mirroring
+ * @li @ref Elm_Scaling
+ * @li @ref Elm_Styles
+ * @li @ref Elm_Theme
+ * @li @ref Elm_Transit
+ * @li @ref Elm_WidgetNavigation
*
* The other two main groups in Elementary are:
* @li @ref widgetslist - These are the widgets you'll compose your UI out of.
@@ -40,205 +40,205 @@
*
* Here is a list of the widgets and some images to give you an idea of what
* they are:
- * @li @ref Actionslider
+ * @li @ref Elm_Actionslider
*
* @image html img/widget/actionslider/preview-00.png
* @image latex img/widget/actionslider/preview-00.eps
- * @li @ref Bg
+ * @li @ref Elm_Bg
*
* @image html img/widget/bg/preview-00.png
* @image latex img/widget/bg/preview-00.eps
- * @li @ref Bubble
+ * @li @ref Elm_Bubble
*
* @image html img/widget/bubble/preview-00.png
* @image latex img/widget/bubble/preview-00.eps
- * @li @ref Button
+ * @li @ref Elm_Button
*
* @image html img/widget/button/preview-00.png
* @image latex img/widget/button/preview-00.eps
- * @li @ref Calendar
+ * @li @ref Elm_Calendar
*
* @image html img/widget/calendar/preview-00.png
* @image latex img/widget/calendar/preview-00.eps
- * @li @ref Check
+ * @li @ref Elm_Check
*
* @image html img/widget/check/preview-00.png
* @image latex img/widget/check/preview-00.eps
- * @li @ref Clock
+ * @li @ref Elm_Clock
*
* @image html img/widget/clock/preview-00.png
* @image latex img/widget/clock/preview-00.eps
*
- * @li @ref Colorselector
+ * @li @ref Elm_Colorselector
*
* @image html img/widget/colorselector/preview-00.png
* @image latex img/widget/colorselector/preview-00.eps
- * @li @ref Ctxpopup
+ * @li @ref Elm_Ctxpopup
*
* @image html img/widget/ctxpopup/preview-00.png
* @image latex img/widget/ctxpopup/preview-00.eps
- * @li @ref Combobox
+ * @li @ref Elm_Combobox
*
* @image html img/widget/combobox/preview-00.png
* @image latex img/widget/combobox/preview-00.eps
- * @li @ref Datetime
+ * @li @ref Elm_Datetime
*
* @image html img/widget/datetime/preview-00.png
* @image latex img/widget/datetime/preview-00.eps
- * @li @ref Dayselector
+ * @li @ref Elm_Dayselector
*
* @image html img/widget/dayselector/preview-00.png
* @image latex img/widget/dayselector/preview-00.eps
- * @li @ref Diskselector
+ * @li @ref Elm_Diskselector
*
* @image html img/widget/diskselector/preview-00.png
* @image latex img/widget/diskselector/preview-00.eps
- * @li @ref Entry
+ * @li @ref Elm_Entry
*
* @image html img/widget/entry/preview-02.png
* @image latex img/widget/entry/preview-02.eps
- * @li @ref File_Selector_Button
+ * @li @ref Elm_File_Selector_Button
*
* @image html img/widget/fileselector_button/preview-00.png
* @image latex img/widget/fileselector_button/preview-00.eps
- * @li @ref File_Selector_Entry
+ * @li @ref Elm_File_Selector_Entry
*
* @image html img/widget/fileselector_entry/preview-00.png
* @image latex img/widget/fileselector_entry/preview-00.eps
- * @li @ref Fileselector
+ * @li @ref Elm_Fileselector
*
* @image html img/widget/fileselector/preview-00.png
* @image latex img/widget/fileselector/preview-00.eps
- * @li @ref Flip
+ * @li @ref Elm_Flip
*
* @image html img/widget/flip/preview-00.png
* @image latex img/widget/flip/preview-00.eps
- * @li @ref Flipselector
+ * @li @ref Elm_Flipselector
*
* @image html img/widget/flipselector/preview-00.png
* @image latex img/widget/flipselector/preview-00.eps
- * @li @ref Frame
+ * @li @ref Elm_Frame
*
* @image html img/widget/frame/preview-00.png
* @image latex img/widget/frame/preview-00.eps
*
- * @li @ref GLView
- * @li @ref Hover
+ * @li @ref Elm_GLView
+ * @li @ref Elm_Hover
*
* @image html img/widget/hover/preview-00.png
* @image latex img/widget/hover/preview-00.eps
- * @li @ref Hoversel
+ * @li @ref Elm_Hoversel
*
* @image html img/widget/hoversel/preview-00.png
* @image latex img/widget/hoversel/preview-00.eps
- * @li @ref Icon
+ * @li @ref Elm_Icon
*
* @image html img/widget/icon/preview-00.png
* @image latex img/widget/icon/preview-00.eps
- * @li @ref Image
+ * @li @ref Elm_Image
*
* @image html img/widget/image/preview-00.png
* @image latex img/widget/image/preview-00.eps
- * @li @ref Index
+ * @li @ref Elm_Index
*
* @image html img/widget/index/preview-00.png
* @image latex img/widget/index/preview-00.eps
- * @li @ref Inwin
+ * @li @ref Elm_Inwin
*
* @image html img/widget/inwin/preview-00.png
* @image latex img/widget/inwin/preview-00.eps
- * @li @ref List
+ * @li @ref Elm_List
*
* @image html img/widget/list/preview-00.png
* @image latex img/widget/list/preview-00.eps
* @image html img/list.png
* @image latex img/list.eps
- * @li @ref Label
+ * @li @ref Elm_Label
*
* @image html img/widget/label/preview-00.png
* @image latex img/widget/label/preview-00.eps
- * @li @ref Map
+ * @li @ref Elm_Map
*
* @image html img/widget/map/preview-00.png
* @image latex img/widget/map/preview-00.eps
- * @li @ref Mapbuf
+ * @li @ref Elm_Mapbuf
*
* @image html img/widget/mapbuf/preview-00.png
* @image latex img/widget/mapbuf/preview-00.eps
- * @li @ref Menu
+ * @li @ref Elm_Menu
*
* @image html img/widget/menu/preview-00.png
* @image latex img/widget/menu/preview-00.eps
- * @li @ref Notify
+ * @li @ref Elm_Notify
*
* @image html img/widget/notify/preview-00.png
* @image latex img/widget/notify/preview-00.eps
- * @li @ref Panel
+ * @li @ref Elm_Panel
*
* @image html img/widget/panel/preview-00.png
* @image latex img/widget/panel/preview-00.eps
- * @li @ref Photo
- * @li @ref Photocam
+ * @li @ref Elm_Photo
+ * @li @ref Elm_Photocam
*
* @image html img/widget/photocam/preview-00.png
* @image latex img/widget/photocam/preview-00.eps
- * @li @ref Popup
+ * @li @ref Elm_Popup
*
- * @li @ref Prefs
+ * @li @ref Elm_Prefs
*
* @image html img/widget/prefs/preview-00.png
* @image latex img/widget/prefs/preview-00.eps
* @image html img/prefs.png
* @image latex img/prefs.eps
*
- * @li @ref Progressbar
+ * @li @ref Elm_Progressbar
*
* @image html img/widget/progressbar/preview-00.png
* @image latex img/widget/progressbar/preview-00.eps
- * @li @ref Radio
+ * @li @ref Elm_Radio
*
* @image html img/widget/radio/preview-00.png
* @image latex img/widget/radio/preview-00.eps
- * @li @ref Route
- * @li @ref SegmentControl
+ * @li @ref Elm_Route
+ * @li @ref Elm_SegmentControl
*
* @image html img/widget/segment_control/preview-00.png
* @image latex img/widget/segment_control/preview-00.eps
* @image html img/segment_control.png
* @image latex img/segment_control.eps
- * @li @ref Separator
+ * @li @ref Elm_Separator
*
* @image html img/widget/separator/preview-00.png
* @image latex img/widget/separator/preview-00.eps
- * @li @ref Slider
+ * @li @ref Elm_Slider
*
* @image html img/widget/slider/preview-00.png
* @image latex img/widget/slider/preview-00.eps
- * @li @ref Slideshow
+ * @li @ref Elm_Slideshow
*
* @image html img/widget/slideshow/preview-00.png
* @image latex img/widget/slideshow/preview-00.eps
- * @li @ref Spinner
+ * @li @ref Elm_Spinner
*
* @image html img/widget/spinner/preview-00.png
* @image latex img/widget/spinner/preview-00.eps
- * @li @ref Thumb
+ * @li @ref Elm_Thumb
* @image html img/widget/thumb/preview-00.png
* @image latex img/widget/thumb/preview-00.eps
- * @li @ref Toolbar
+ * @li @ref Elm_Toolbar
*
* @image html img/widget/toolbar/preview-00.png
* @image latex img/widget/toolbar/preview-00.eps
* @image html img/toolbar.png
* @image latex img/toolbar.eps
- * @li @ref Tooltips
- * @li @ref Video
- * @li @ref Web
+ * @li @ref Elm_Tooltips
+ * @li @ref Elm_Video
+ * @li @ref Elm_Web
*
* @image html img/widget/web/preview-00.png
* @image latex img/widget/web/preview-00.eps
- * @li @ref Win
+ * @li @ref Elm_Win
*
* @image html img/widget/win/preview-00.png
* @image latex img/widget/win/preview-00.eps
@@ -254,49 +254,49 @@
* it provides a number of containers. It's important to note that as containers
* widgets don't have their own visual identity, so here we show one use for
* them and a diagram showing their component parts:
- * @li @ref Gengrid
+ * @li @ref Elm_Gengrid
*
* @image html img/widget/gengrid/preview-00.png
* @image latex img/widget/gengrid/preview-00.eps
- * @li @ref Genlist
+ * @li @ref Elm_Genlist
*
* @image html img/widget/genlist/preview-00.png
* @image latex img/widget/genlist/preview-00.eps
* @image html img/genlist.png
* @image latex img/genlist.eps
- * @li @ref Box
+ * @li @ref Elm_Box
*
* @image html img/widget/box/preview-00.png
* @image latex img/widget/box/preview-00.eps
* @image html img/box.png
* @image latex img/box.eps
- * @li @ref Conformant
+ * @li @ref Elm_Conformant
*
* @image html img/widget/conformant/preview-00.png
* @image latex img/widget/conformant/preview-00.eps
* @image html img/conformant.png
* @image latex img/conformant.eps
- * @li @ref Grid
- * @li @ref Layout
+ * @li @ref Elm_Grid
+ * @li @ref Elm_Layout
*
* @image html img/widget/layout/preview-00.png
* @image latex img/widget/layout/preview-00.eps
* @image html img/layout-predefined.png
* @image latex img/layout-predefined.eps
*
- * @li @ref Naviframe
+ * @li @ref Elm_Naviframe
*
- * @li @ref Panes
+ * @li @ref Elm_Panes
*
* @image html img/widget/panes/preview-00.png
* @image latex img/widget/panes/preview-00.eps
* @image html img/panes.png
* @image latex img/panes.eps
- * @li @ref Scroller
+ * @li @ref Elm_Scroller
*
* @image html img/widget/scroller/preview-00.png
* @image latex img/widget/scroller/preview-00.eps
- * @li @ref Table
+ * @li @ref Elm_Table
*
* @image html img/widget/table/preview-00.png
* @image latex img/widget/table/preview-00.eps
diff --git a/src/bin/test_application_server.c b/src/bin/test_application_server.c
index 13a9039..d05d74e 100644
--- a/src/bin/test_application_server.c
+++ b/src/bin/test_application_server.c
@@ -100,7 +100,7 @@ _create_view_cb(Elm_App_Server *app_server, const Eina_Value *args EINA_UNUSED,
return NULL;
}
- eo_add(&view, ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(view, NULL));
+ view = eo_add(ELM_APP_SERVER_VIEW_CLASS, app_server, elm_app_server_view_id_set(eo_self, NULL));
id = elm_app_server_view_id_get(view);
pkg = elm_app_server_package_get(app_server);
@@ -141,7 +141,7 @@ test_application_server_common(const char *pkg)
Elm_App_Server_View *view;
Elm_App_Server *server;
- eo_add(&server, ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(server, pkg, _create_view_cb));
+ server = eo_add(ELM_APP_SERVER_CLASS, NULL, elm_app_server_constructor(eo_self, pkg, _create_view_cb));
elm_app_server_title_set(server, pkg);
views_iter = elm_app_server_views_get(server);
eo_event_callback_add(server, ELM_APP_SERVER_EVENT_TERMINATE, _terminate_cb, NULL);
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index 2782299..88e223f 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -77,10 +77,23 @@ _focus_anim_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
elm_win_focus_highlight_animate_set(data, EINA_FALSE);
}
+static void
+_rd_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+ int value = elm_radio_state_value_get(obj);
+
+ if (value == 0)
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_CLICK);
+ else if (value == 1)
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_IN);
+ else
+ elm_config_focus_move_policy_set(ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+}
+
void
test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- Evas_Object *win, *tbx, *tbar, *menu;
+ Evas_Object *win, *tbx, *tbar, *mainbx, *menu, *ttb;
Elm_Object_Item *tb_it;
Elm_Object_Item *menu_it;
unsigned int i, j;
@@ -121,8 +134,8 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
elm_toolbar_item_menu_set(tb_it, EINA_TRUE);
elm_toolbar_item_priority_set(tb_it, -9999);
elm_toolbar_menu_parent_set(tbar, win);
- menu = elm_toolbar_item_menu_get(tb_it);
+ menu = elm_toolbar_item_menu_get(tb_it);
elm_menu_item_add(menu, NULL, "edit-cut", "Shrink", _tb_sel, NULL);
menu_it = elm_menu_item_add(menu, NULL, "edit-copy", "Mode", _tb_sel, NULL);
elm_menu_item_add(menu, menu_it, "edit-paste", "is set to", _tb_sel, NULL);
@@ -131,7 +144,7 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
elm_box_pack_end(tbx, tbar);
evas_object_show(tbar);
- Evas_Object *mainbx = elm_box_add(win);
+ mainbx = elm_box_add(win);
elm_box_horizontal_set(mainbx, EINA_TRUE);
evas_object_size_hint_weight_set(mainbx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_box_pack_end(tbx, mainbx);
@@ -304,8 +317,7 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
Evas_Object *ly = elm_layout_add(win);
snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
elm_layout_file_set(ly, buf, "twolines");
- evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
+ evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(mainbx, ly);
my_show(ly);
@@ -362,6 +374,30 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
evas_object_smart_callback_add(bt2, "clicked", my_enable, bt);
my_show(bt2);
elm_object_focus_custom_chain_append(bx2, bt2, NULL);
+
+ Evas_Object *bt3;
+ bt3 = elm_button_add(win);
+ elm_object_text_set(bt3, "KeyOnly with Auto");
+ elm_object_focus_move_policy_set(bt3, ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+ elm_object_focus_move_policy_automatic_set(bt, EINA_TRUE); // EINA_TURE is default
+ evas_object_size_hint_align_set(bt3, EVAS_HINT_FILL,
+ EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt3, 0.0, 0.0);
+ elm_box_pack_end(bx2, bt3);
+ my_show(bt3);
+ elm_object_focus_custom_chain_append(bx2, bt3, NULL);
+
+ Evas_Object *bt4;
+ bt4 = elm_button_add(win);
+ elm_object_text_set(bt4, "KeyOnly without Auto");
+ elm_object_focus_move_policy_set(bt4, ELM_FOCUS_MOVE_POLICY_KEY_ONLY);
+ elm_object_focus_move_policy_automatic_set(bt4, EINA_FALSE);
+ evas_object_size_hint_align_set(bt4, EVAS_HINT_FILL,
+ EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt4, 0.0, 0.0);
+ elm_box_pack_end(bx2, bt4);
+ my_show(bt4);
+ elm_object_focus_custom_chain_append(bx2, bt4, NULL);
}
}
@@ -430,33 +466,65 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
}
}
- Evas_Object *bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND,
- EVAS_HINT_EXPAND);
- elm_box_pack_end(tbx, bx);
- my_show(bx);
+ ttb = elm_table_add(win);
+ evas_object_size_hint_weight_set(ttb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_box_pack_end(tbx, ttb);
+ my_show(ttb);
{
Evas_Object *ck;
- ck = elm_check_add(bx);
+ ck = elm_check_add(ttb);
elm_object_text_set(ck, "Focus Highlight Enable");
elm_check_state_set(ck, elm_win_focus_highlight_enabled_get(win));
- elm_box_pack_end(bx, ck);
+ evas_object_size_hint_align_set(ck, 0.0, EVAS_HINT_FILL);
+ elm_table_pack(ttb, ck, 0, 0, 1, 1);
my_show(ck);
evas_object_smart_callback_add(ck, "changed",
_focus_highlight_changed,
win);
- ck = elm_check_add(bx);
+ ck = elm_check_add(ttb);
elm_object_text_set(ck, "Focus Highlight Animation Enable");
elm_check_state_set(ck, elm_win_focus_highlight_animate_get(win));
- elm_box_pack_end(bx, ck);
+ evas_object_size_hint_align_set(ck, 0.0, EVAS_HINT_FILL);
+ elm_table_pack(ttb, ck, 0, 1, 1, 1);
my_show(ck);
evas_object_smart_callback_add(ck, "changed",
_focus_anim_changed,
win);
}
+
+ {
+ Evas_Object *rd, *rdg;
+
+ for (i = 0; i < 3; i++)
+ {
+ rd = elm_radio_add(ttb);
+ elm_radio_state_value_set(rd, i);
+ evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(rd, 0.0, EVAS_HINT_FILL);
+ elm_table_pack(ttb, rd, 1, i, 1, 1);
+ evas_object_show(rd);
+ evas_object_smart_callback_add(rd, "changed", _rd_changed_cb, NULL);
+
+ if (i == 0)
+ {
+ rdg = rd;
+ elm_object_text_set(rd, "Move Policy: Key+Click(Default)");
+ }
+ else if (i == 1)
+ {
+ elm_radio_group_add(rd, rdg);
+ elm_object_text_set(rd, "Move Policy: Key+Click+In");
+ }
+ else
+ {
+ elm_radio_group_add(rd, rdg);
+ elm_object_text_set(rd, "Move Policy: Key Only");
+ }
+ }
+ }
}
/**** focus 2 ****/
diff --git a/src/bin/test_systray.c b/src/bin/test_systray.c
index 23fc8af..1271242 100644
--- a/src/bin/test_systray.c
+++ b/src/bin/test_systray.c
@@ -82,7 +82,7 @@ test_systray(void *data EINA_UNUSED,
elm_menu_item_add(it, it2, NULL, "item 2", _menu_clicked, "item 2");
// Status Notifier Item Handler
- eo_add(&item, ELM_SYSTRAY_CLASS, win);
+ item = eo_add(ELM_SYSTRAY_CLASS, win);
elm_obj_systray_icon_name_set(item, "elementary");
elm_obj_systray_att_icon_name_set(item, "elementary");
elm_obj_systray_menu_set(item, it);
diff --git a/src/bin/test_task_switcher.c b/src/bin/test_task_switcher.c
index ec42837..fae686e 100644
--- a/src/bin/test_task_switcher.c
+++ b/src/bin/test_task_switcher.c
@@ -303,7 +303,7 @@ _app_open(const char *package)
return;
}
- eo_add(&app, ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(app, package));
+ app = eo_add(ELM_APP_CLIENT_CLASS, NULL, elm_app_client_constructor(eo_self, package));
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_LIST_LOADED, _view_list_update_cb, table);
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_CREATED, _view_list_update_cb, table);
eo_event_callback_add(app, ELM_APP_CLIENT_EVENT_VIEW_DELETED, _view_list_update_cb, table);
diff --git a/src/examples/evas3d_map_example.c b/src/examples/evas3d_map_example.c
index 3599826..5cfb010 100644
--- a/src/examples/evas3d_map_example.c
+++ b/src/examples/evas3d_map_example.c
@@ -463,7 +463,7 @@ zoom_factor_set(double new_zoom_factor)
evas_object_resize(map, src_size, src_size);
/* Apply updated texture source. */
- eo_add(&texture_diffuse, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
evas_canvas3d_texture_source_set(texture_diffuse, map);
evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
@@ -846,7 +846,7 @@ skybox_setup(void)
Evas_Object *skybox_image;
char buf[PATH_MAX];
- eo_add(&skybox_mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+ skybox_mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
evas_canvas3d_mesh_vertex_count_set(skybox_mesh, 24);
evas_canvas3d_mesh_frame_add(skybox_mesh, 0);
evas_canvas3d_mesh_frame_vertex_data_set(skybox_mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &skybox_vertices[0]);
@@ -864,10 +864,10 @@ skybox_setup(void)
evas_object_show(skybox_image);
/* Set skybox texture material. */
- eo_add(&skybox_material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ skybox_material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
evas_canvas3d_mesh_frame_material_set(skybox_mesh, 0, skybox_material);
- eo_add(&skybox_texture_diffuse, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ skybox_texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
evas_canvas3d_texture_source_set(skybox_texture_diffuse, skybox_image);
evas_canvas3d_texture_source_visible_set(skybox_texture_diffuse, EINA_FALSE);
@@ -881,7 +881,7 @@ skybox_setup(void)
evas_canvas3d_material_color_set(skybox_material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
evas_canvas3d_material_shininess_set(skybox_material, 50.0);
- eo_add(&skybox_mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(skybox_mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ skybox_mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_node_member_add(root_node, skybox_mesh_node);
evas_canvas3d_node_mesh_add(skybox_mesh_node, skybox_mesh);
evas_canvas3d_mesh_shade_mode_set(skybox_mesh, EVAS_CANVAS3D_SHADE_MODE_DIFFUSE);
@@ -922,7 +922,7 @@ static void
camera_setup(void)
{
/* Add the camera. */
- eo_add(&camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+ camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
evas_canvas3d_camera_projection_perspective_set(camera, 60.0, 1.0, 1.0, 100.0);
/* Set camera position. */
@@ -940,7 +940,7 @@ camera_setup(void)
camera_right_vec.y = 0.0;
camera_right_vec.z = 0.0;
- eo_add(&camera_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+ camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
evas_canvas3d_node_camera_set(camera_node, camera);
evas_canvas3d_node_position_set(camera_node, camera_pos.x, camera_pos.y, camera_pos.z);
evas_canvas3d_node_look_at_set(camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, camera_up_vec.x, camera_up_vec.y, camera_up_vec.z);
@@ -950,12 +950,12 @@ camera_setup(void)
static void
light_setup(void)
{
- eo_add(&light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
+ light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
evas_canvas3d_light_ambient_set(light, 0.2, 0.2, 0.2, 1.0);
evas_canvas3d_light_diffuse_set(light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_specular_set(light, 0.2, 0.2, 0.2, 1.0);
- eo_add(&light_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+ light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
evas_canvas3d_node_light_set(light_node, light);
evas_canvas3d_node_position_set(light_node, 0.0, 0.0, MAX_CAMERA_DISTANCE);
evas_canvas3d_node_look_at_set(light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -968,7 +968,7 @@ mesh_setup(void)
/* Create a sphere mesh. */
sphere_init(50);
- eo_add(&mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+ mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
evas_canvas3d_mesh_vertex_count_set(mesh, vertex_count);
evas_canvas3d_mesh_frame_add(mesh, 0);
evas_canvas3d_mesh_frame_vertex_data_set(mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, sizeof(vertex), &vertices[0].position);
@@ -979,14 +979,14 @@ mesh_setup(void)
evas_canvas3d_mesh_index_data_set(mesh, EVAS_CANVAS3D_INDEX_FORMAT_UNSIGNED_SHORT, index_count, &indices[0]);
evas_canvas3d_mesh_vertex_assembly_set(mesh, EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES);
- eo_add(&material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
evas_canvas3d_mesh_frame_material_set(mesh, 0, material);
- eo_add(&texture_diffuse, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ texture_diffuse = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
evas_canvas3d_texture_source_set(texture_diffuse, map);
evas_canvas3d_texture_source_visible_set(texture_diffuse, EINA_FALSE);
- eo_add(&texture_normal, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ texture_normal = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
evas_canvas3d_texture_source_set(texture_normal, normal_map);
evas_canvas3d_texture_source_visible_set(texture_normal, EINA_FALSE);
@@ -1001,7 +1001,7 @@ mesh_setup(void)
evas_canvas3d_material_color_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, 0.1, 0.1, 0.1, 1.0);
evas_canvas3d_material_shininess_set(material, 50.0);
- eo_add(&mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ mesh_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_node_member_add(root_node, mesh_node);
evas_canvas3d_node_mesh_add(mesh_node, mesh);
evas_canvas3d_mesh_shade_mode_set(mesh, EVAS_CANVAS3D_SHADE_MODE_NORMAL_MAP);
@@ -1156,7 +1156,7 @@ elm_main(int argc, char **argv)
evas_object_show(bg);
/* Add an image which shows a scene. */
- image = evas_object_image_filled_add(evas);
+ image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
evas_object_resize(image, WIDTH, HEIGHT);
evas_object_show(image);
@@ -1166,10 +1166,10 @@ elm_main(int argc, char **argv)
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_WHEEL, mouse_wheel_cb, NULL);
/* Add a scene object. */
- eo_add(&scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
+ scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
/* Add a root node for the scene. */
- eo_add(&root_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(root_node, EVAS_CANVAS3D_NODE_TYPE_NODE));
+ root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
skybox_setup();
texture_source_setup();
@@ -1181,7 +1181,7 @@ elm_main(int argc, char **argv)
evas_canvas3d_scene_root_node_set(scene, root_node);
evas_canvas3d_scene_camera_node_set(scene, camera_node);
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
- evas_obj_image_scene_set(image, scene);
+ efl_canvas_scene3d_set(image, scene);
/* Add a layout for controlers. */
control_layout = elm_layout_add(win);
diff --git a/src/examples/evas3d_object_on_button_example.c b/src/examples/evas3d_object_on_button_example.c
index 3a5f1b4..842cdfd 100644
--- a/src/examples/evas3d_object_on_button_example.c
+++ b/src/examples/evas3d_object_on_button_example.c
@@ -159,11 +159,12 @@ _animate_scene(void *data)
static void
_camera_setup(Scene_Data *data)
{
- eo_add(&data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+ data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
evas_canvas3d_camera_projection_perspective_set(data->camera, 20.0, 1.0, 2.0, 50.0);
- eo_add(&data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+ data->camera_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 15.0);
evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, -1.0, 0.0);
@@ -173,12 +174,13 @@ _camera_setup(Scene_Data *data)
static void
_light_setup(Scene_Data *data)
{
- eo_add(&data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
+ data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
- eo_add(&data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+ data->light_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
evas_canvas3d_node_light_set(data->light_node, data->light);
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -188,8 +190,8 @@ static void
_mesh_setup(Scene_Data *data)
{
/* Setup material and texture as widget button. */
- eo_add(&data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
- eo_add(&data->texture, EVAS_CANVAS3D_TEXTURE_CLASS, evas);
+ data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ data->texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, evas);
evas_canvas3d_texture_source_set(data->texture, btn);
evas_canvas3d_texture_source_visible_set(data->texture, EINA_FALSE);
@@ -204,7 +206,7 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_material_shininess_set(data->material, 100.0);
/* Setup mesh. */
- eo_add(&data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
evas_canvas3d_mesh_frame_add(data->mesh, 0);
evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -217,7 +219,8 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
evas_canvas3d_mesh_color_pick_enable_set(data->mesh, EINA_TRUE);
- eo_add(&data->mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ data->mesh_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
}
@@ -225,11 +228,12 @@ _mesh_setup(Scene_Data *data)
static void
_scene_setup(Scene_Data *data)
{
- eo_add(&data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
+ data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
- eo_add(&data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->root_node, EVAS_CANVAS3D_NODE_TYPE_NODE));
+ data->root_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);
@@ -253,7 +257,7 @@ elm_main(int argc, char **argv)
evas = evas_object_evas_get(win);
/* Add an image object for 3D scene rendering. */
- image = evas_object_image_filled_add(evas);
+ image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_size_set(image, WIDTH, HEIGHT);
efl_gfx_visible_set(image, EINA_TRUE);
@@ -266,7 +270,7 @@ elm_main(int argc, char **argv)
/* Set the image object as render target for 3D scene. */
_scene_setup(&data);
evas_object_focus_set(image, EINA_TRUE);
- evas_obj_image_scene_set(image, data.scene);
+ efl_canvas_scene3d_set(image, data.scene);
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _stop_scene, &data);
evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_UP, _play_scene, &data);
diff --git a/src/examples/evas3d_scene_on_button_example.c b/src/examples/evas3d_scene_on_button_example.c
index 8a70ec8..2aa8a2f 100644
--- a/src/examples/evas3d_scene_on_button_example.c
+++ b/src/examples/evas3d_scene_on_button_example.c
@@ -120,11 +120,12 @@ _animate_scene(void *data)
static void
_camera_setup(Scene_Data *data)
{
- eo_add(&data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+ data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
evas_canvas3d_camera_projection_perspective_set(data->camera, 60.0, 1.0, 2.0, 50.0);
- eo_add(&data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+ data->camera_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
evas_canvas3d_node_position_set(data->camera_node, 0.0, 0.0, 10.0);
evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -134,12 +135,13 @@ _camera_setup(Scene_Data *data)
static void
_light_setup(Scene_Data *data)
{
- eo_add(&data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
+ data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
- eo_add(&data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+ data->light_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
evas_canvas3d_node_light_set(data->light_node, data->light);
evas_canvas3d_node_position_set(data->light_node, 0.0, 0.0, 10.0);
evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -149,7 +151,7 @@ static void
_mesh_setup(Scene_Data *data)
{
/* Setup material. */
- eo_add(&data->material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ data->material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
evas_canvas3d_material_enable_set(data->material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -160,7 +162,7 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_material_shininess_set(data->material, 100.0);
/* Setup mesh. */
- eo_add(&data->mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
+ data->mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
evas_canvas3d_mesh_vertex_count_set(data->mesh, 24);
evas_canvas3d_mesh_frame_add(data->mesh, 0);
evas_canvas3d_mesh_frame_vertex_data_set(data->mesh, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -172,7 +174,8 @@ _mesh_setup(Scene_Data *data)
evas_canvas3d_mesh_shade_mode_set(data->mesh, EVAS_CANVAS3D_SHADE_MODE_PHONG);
evas_canvas3d_mesh_frame_material_set(data->mesh, 0, data->material);
- eo_add(&data->mesh_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ data->mesh_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_node_member_add(data->root_node, data->mesh_node);
evas_canvas3d_node_mesh_add(data->mesh_node, data->mesh);
}
@@ -180,11 +183,12 @@ _mesh_setup(Scene_Data *data)
static void
_scene_setup(Scene_Data *data)
{
- eo_add(&data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
+ data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
evas_canvas3d_scene_size_set(data->scene, WIDTH - d_w, HEIGHT - d_h);
evas_canvas3d_scene_background_color_set(data->scene, 0.0, 0.0, 0.0, 0.0);
- eo_add(&data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->root_node, EVAS_CANVAS3D_NODE_TYPE_NODE));
+ data->root_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
_camera_setup(data);
_light_setup(data);
@@ -246,11 +250,11 @@ elm_main(int argc, char **argv)
_scene_setup(&data);
- image = evas_object_image_filled_add(evas);
+ image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_visible_set(image, EINA_TRUE);
/* Set the image object as render target for 3D scene. */
- evas_obj_image_scene_set(image, data.scene);
+ efl_canvas_scene3d_set(image, data.scene);
/* Setup scene to the widget button. */
btn = elm_button_add(win);
diff --git a/src/examples/filemvc.c b/src/examples/filemvc.c
index c217dcb..f681e7c 100644
--- a/src/examples/filemvc.c
+++ b/src/examples/filemvc.c
@@ -71,7 +71,7 @@ _tree_selected_cb(void *data, const Eo_Event *event)
efl_model_property_get(child, "path", &vpath);
eina_value_get(vpath, &path);
- eo_add(&model, EIO_MODEL_CLASS, NULL, eio_model_path_set(model, path));
+ model = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, path));
efl_model_load(model);
elm_view_list_model_set(priv->fileview, model);
return EINA_TRUE;
@@ -137,13 +137,13 @@ elm_main(int argc, char **argv)
else dirname = EFL_MODEL_TEST_FILENAME_PATH;
//treemodel
- eo_add(&priv.treemodel, EIO_MODEL_CLASS, NULL, eio_model_path_set(priv.treemodel, dirname));
+ priv.treemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
efl_model_load(priv.treemodel);
//treeview
genlist = elm_genlist_add(win);
- eo_add(&priv.treeview, ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(priv.treeview, genlist, ELM_GENLIST_ITEM_TREE, NULL));
+ priv.treeview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, NULL));
elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
elm_view_list_model_set(priv.treeview, priv.treemodel);
@@ -157,7 +157,7 @@ elm_main(int argc, char **argv)
eo_event_callback_add(priv.treeview, ELM_VIEW_LIST_EVENT_MODEL_SELECTED, _tree_selected_cb, &priv);
//listview
genlist = elm_genlist_add(win);
- eo_add(&priv.fileview, ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(priv.fileview, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
+ priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
elm_view_list_property_connect(priv.fileview, "size", "elm.text.sub");
@@ -171,7 +171,7 @@ elm_main(int argc, char **argv)
bxr = elm_box_add(win);
_widget_init(bxr);
elm_object_part_content_set(vpanes, "right", bxr);
- eo_add(&priv.formview, ELM_VIEW_FORM_CLASS, NULL);
+ priv.formview = eo_add(ELM_VIEW_FORM_CLASS, NULL);
/*Label widget */
elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
diff --git a/src/examples/fileviewlist.c b/src/examples/fileviewlist.c
index 1c420c3..4572e9d 100644
--- a/src/examples/fileviewlist.c
+++ b/src/examples/fileviewlist.c
@@ -55,8 +55,8 @@ elm_main(int argc, char **argv)
evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(genlist);
- eo_add(&priv.filemodel, EIO_MODEL_CLASS, NULL, eio_model_path_set(priv.filemodel, dirname));
- eo_add(&priv.fileview, ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(priv.fileview, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
+ priv.filemodel = eo_add(EIO_MODEL_CLASS, NULL, eio_model_path_set(eo_self, dirname));
+ priv.fileview = eo_add(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(eo_self, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
elm_view_list_model_set(priv.fileview, priv.filemodel);
efl_model_load(priv.filemodel);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
diff --git a/src/examples/performance/graphical.c b/src/examples/performance/graphical.c
index deae035..7ca4d4c 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -248,7 +248,7 @@ void _init_bounding()
20, 21, 22, 22, 21, 23
};
- eo_add(&globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
+ globalGraphical.material_box = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
evas_canvas3d_material_enable_set(globalGraphical.material_box, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -259,7 +259,7 @@ void _init_bounding()
evas_canvas3d_material_shininess_set(globalGraphical.material_box, 100.0);
/* Setup mesh. */
- eo_add(&globalGraphical.mesh_box, EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+ globalGraphical.mesh_box = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh_box, 24);
evas_canvas3d_mesh_frame_add(globalGraphical.mesh_box, 0);
evas_canvas3d_mesh_frame_vertex_data_copy_set(globalGraphical.mesh_box, 0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 12 * sizeof(float), &cube_vertices[ 0]);
@@ -271,7 +271,8 @@ void _init_bounding()
evas_canvas3d_mesh_shade_mode_set(globalGraphical.mesh_box, EVAS_CANVAS3D_SHADE_MODE_PHONG);
evas_canvas3d_mesh_frame_material_set(globalGraphical.mesh_box, 0, globalGraphical.material_box);
- eo_add(&globalGraphical.mesh_nodebox, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.mesh_nodebox, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(globalGraphical.mesh_nodebox, 0, -30.0, 0.0));
+ globalGraphical.mesh_nodebox =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, 0, -30.0, 0.0));
evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_nodebox);
evas_canvas3d_node_mesh_add(globalGraphical.mesh_nodebox, globalGraphical.mesh_box);
}
@@ -306,7 +307,7 @@ _change_scene_setup()
_sphere_init(globalGraphical.precision);
for (i = 0; i < quantity; i++)
{
- eo_add(&globalGraphical.mesh, EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+ globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
if (!globalGraphical.model_path)
{
evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -357,7 +358,8 @@ _change_scene_setup()
_sphere_count(globalGraphical.count, 0.2);
for (i = 0; i < quantity; i++)
{
- eo_add(&globalGraphical.mesh_node, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(globalGraphical.mesh_node, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
+ globalGraphical.mesh_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
if (globalGraphical.model_path)
evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -392,37 +394,39 @@ _init_scene(Evas_Object *img)
/*Allocate memory - eina_mempool*/
/* Add a scene object .*/
- eo_add(&globalGraphical.scene, EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
+ globalGraphical.scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, globalGraphical.evas);
/* Add the root node for the scene. */
- eo_add(&globalGraphical.root_node, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.root_node, EVAS_CANVAS3D_NODE_TYPE_NODE));
+ globalGraphical.root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
/* Add the camera. */
- eo_add(&globalGraphical.camera, EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
+ globalGraphical.camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, globalGraphical.evas);
evas_canvas3d_camera_projection_perspective_set(globalGraphical.camera, globalGraphical.angle, 1.0, 2.0, 1000.0);
- eo_add(&globalGraphical.camera_node, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+ globalGraphical.camera_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
evas_canvas3d_node_camera_set(globalGraphical.camera_node, globalGraphical.camera);
evas_canvas3d_node_position_set(globalGraphical.camera_node, 0.0, 0.0, 25.0);
evas_canvas3d_node_look_at_set(globalGraphical.camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.camera_node);
- eo_add(&globalGraphical.light, EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
+ globalGraphical.light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, globalGraphical.evas);
evas_canvas3d_light_ambient_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_diffuse_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_specular_set(globalGraphical.light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_projection_perspective_set(globalGraphical.light, globalGraphical.angle / 5, 1.0, 1.0, 1000.0);
evas_canvas3d_light_spot_cutoff_set(globalGraphical.light, globalGraphical.angle / 15);
- eo_add(&globalGraphical.light_node, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+ globalGraphical.light_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
evas_canvas3d_node_light_set(globalGraphical.light_node, globalGraphical.light);
evas_canvas3d_node_position_set(globalGraphical.light_node, 0.0, 100.0, 1.0);
evas_canvas3d_node_look_at_set(globalGraphical.light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.light_node);
- eo_add(&globalGraphical.material, EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
- eo_add(&globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
+ globalGraphical.material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, globalGraphical.evas);
+ globalGraphical.texture = eo_add(EVAS_CANVAS3D_TEXTURE_CLASS, globalGraphical.evas);
evas_canvas3d_texture_file_set(globalGraphical.texture, "target_texture.png", NULL);
evas_canvas3d_texture_filter_set(globalGraphical.texture, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR, EVAS_CANVAS3D_TEXTURE_FILTER_LINEAR);
evas_canvas3d_texture_wrap_set(globalGraphical.texture, EVAS_CANVAS3D_WRAP_MODE_REPEAT, EVAS_CANVAS3D_WRAP_MODE_REPEAT);
@@ -440,7 +444,7 @@ _init_scene(Evas_Object *img)
for (i = 0; i < quantity; i++)
{
- eo_add(&globalGraphical.mesh, EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
+ globalGraphical.mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, globalGraphical.evas);
if (!globalGraphical.model_path)
{
evas_canvas3d_mesh_vertex_count_set(globalGraphical.mesh, globalGraphical.vertex_count);
@@ -469,7 +473,8 @@ _init_scene(Evas_Object *img)
for (i = 0; i < quantity; i++)
{
- eo_add(&globalGraphical.mesh_node, EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(globalGraphical.mesh_node, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(globalGraphical.mesh_node, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
+ globalGraphical.mesh_node =
+ eo_add(EVAS_CANVAS3D_NODE_CLASS, globalGraphical.evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH), evas_canvas3d_node_position_set(eo_self, globalGraphical.places[i].position.x * 20, globalGraphical.places[i].position.y * 20, globalGraphical.places[i].position.z * 20));
if (globalGraphical.model_path)
evas_canvas3d_node_scale_set(globalGraphical.mesh_node, 0.2, 0.2, 0.2);
evas_canvas3d_node_member_add(globalGraphical.root_node, globalGraphical.mesh_node);
@@ -604,7 +609,7 @@ init_graphical_window(Evas_Object *img)
_init_graphical();
globalGraphical.evas = evas_object_evas_get(img);
_init_scene(img);
- evas_obj_image_scene_set(img, globalGraphical.scene);
+ efl_canvas_scene3d_set(img, globalGraphical.scene);
return img;
}
diff --git a/src/examples/performance/performance.c b/src/examples/performance/performance.c
index c1d0ef8..cdfe6be 100644
--- a/src/examples/performance/performance.c
+++ b/src/examples/performance/performance.c
@@ -622,7 +622,7 @@ EAPI_MAIN
evas_object_show(startexitbox);
evas = evas_object_evas_get(win);
- image = evas_object_image_add(evas);
+ image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
btnstart = elm_button_add(win);
elm_object_text_set(btnstart, "Apply");
@@ -906,7 +906,6 @@ EAPI_MAIN
evas_object_show(fs_bt);
evas_object_smart_callback_add(fs_bt, "file,chosen", _load_mesh, NULL);
- evas_object_image_filled_set(image, EINA_TRUE);
elm_object_part_content_set(layout, "swallow.content", image);
evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
index 9d672fc..44b5dee 100644
--- a/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
+++ b/src/examples/sphere_hunter/evas_3d_sphere_hunter.c
@@ -435,10 +435,10 @@ _quit_game(void *data EINA_UNUSED, Evas_Object *btn EINA_UNUSED, void *ev EINA_U
static void
_camera_setup(Scene_Data *data)
{
- eo_add(&data->camera, EVAS_CANVAS3D_CAMERA_CLASS, evas);
+ data->camera = eo_add(EVAS_CANVAS3D_CAMERA_CLASS, evas);
evas_canvas3d_camera_projection_perspective_set(data->camera, 50.0, 1.0, 1.0, 1000.0);
- eo_add(&data->camera_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->camera_node, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
+ data->camera_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_CAMERA));
evas_canvas3d_node_camera_set(data->camera_node, data->camera);
evas_canvas3d_node_position_set(data->camera_node, 0.0, 40, 70);
evas_canvas3d_node_look_at_set(data->camera_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -459,14 +459,14 @@ _animate_camera(void *data)
static void
_light_setup(Scene_Data *data)
{
- eo_add(&data->light, EVAS_CANVAS3D_LIGHT_CLASS, evas);
+ data->light = eo_add(EVAS_CANVAS3D_LIGHT_CLASS, evas);
evas_canvas3d_light_ambient_set(data->light, 0.2, 0.2, 0.2, 1.0);
evas_canvas3d_light_diffuse_set(data->light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_specular_set(data->light, 1.0, 1.0, 1.0, 1.0);
evas_canvas3d_light_projection_perspective_set(data->light, 100.0, 1.0, 1.0, 1000.0);
- eo_add(&data->light_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->light_node, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
+ data->light_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_LIGHT));
evas_canvas3d_node_light_set(data->light_node, data->light);
evas_canvas3d_node_position_set(data->light_node, 0.1, 25.0, 0.1);
evas_canvas3d_node_look_at_set(data->light_node, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 1.0, 0.0);
@@ -477,8 +477,8 @@ _light_setup(Scene_Data *data)
static void
_mesh_cube_setup(Scene_Data *data)
{
- eo_add(&data->mesh_cube, EVAS_CANVAS3D_MESH_CLASS, evas);
- eo_add(&data->material_cube, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ data->mesh_cube = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+ data->material_cube = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
evas_canvas3d_material_enable_set(data->material_cube, EVAS_CANVAS3D_MATERIAL_ATTRIB_SPECULAR, EINA_TRUE);
@@ -506,9 +506,9 @@ _create_bondar(Scene_Data *data, Evas_Real scale_x, Evas_Real scale_y, Evas_Real
Eo *node = NULL;
Eo *material = NULL;
- eo_add(&mesh, EVAS_CANVAS3D_MESH_CLASS, evas);
- eo_add(&material, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
- eo_add(&node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ mesh = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+ material = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
evas_canvas3d_material_enable_set(material, EVAS_CANVAS3D_MATERIAL_ATTRIB_DIFFUSE, EINA_TRUE);
@@ -556,7 +556,7 @@ _create_cubes(Scene_Data *data, Evas_Real r, int count)
Eo *node = NULL;
alpha = d_alpha * i * M_PI / 180;
- eo_add(&node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(node, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
evas_canvas3d_node_mesh_add(node, data->mesh_cube);
evas_canvas3d_node_position_set(node, r * sin(alpha), 2.0 + (r / 4 * sin(alpha)), r * cos(alpha));
@@ -573,9 +573,9 @@ _mesh_ball_setup(Scene_Data *data)
{
_sphere_init(100);
- eo_add(&data->mesh_ball, EVAS_CANVAS3D_MESH_CLASS, evas);
- eo_add(&data->material_ball, EVAS_CANVAS3D_MATERIAL_CLASS, evas);
- eo_add(&data->mesh_node_ball, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->mesh_node_ball, EVAS_CANVAS3D_NODE_TYPE_MESH));
+ data->mesh_ball = eo_add(EVAS_CANVAS3D_MESH_CLASS, evas);
+ data->material_ball = eo_add(EVAS_CANVAS3D_MATERIAL_CLASS, evas);
+ data->mesh_node_ball = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_MESH));
/* Setup material for ball. */
evas_canvas3d_material_enable_set(data->material_ball, EVAS_CANVAS3D_MATERIAL_ATTRIB_AMBIENT, EINA_TRUE);
@@ -609,10 +609,10 @@ _scene_setup(Scene_Data *data, Evas_Real r, int count)
{
Eina_List *l = NULL;
Eo *item = NULL;
- eo_add(&data->scene, EVAS_CANVAS3D_SCENE_CLASS, evas);
+ data->scene = eo_add(EVAS_CANVAS3D_SCENE_CLASS, evas);
/* Add the root node for the scene. */
- eo_add(&data->root_node, EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(data->root_node, EVAS_CANVAS3D_NODE_TYPE_NODE));
+ data->root_node = eo_add(EVAS_CANVAS3D_NODE_CLASS, evas, evas_canvas3d_node_constructor(eo_self, EVAS_CANVAS3D_NODE_TYPE_NODE));
evas_canvas3d_scene_size_set(data->scene, WIDTH, HEIGHT);
evas_canvas3d_scene_shadows_enable_set(data->scene, EINA_TRUE);
@@ -814,9 +814,9 @@ elm_main(int argc, char **argv)
_scene_setup(&data, 10.0, 10);
- image = evas_object_image_filled_add(evas);
+ image = eo_add(EFL_CANVAS_SCENE3D_CLASS, evas);
efl_gfx_visible_set(image, EINA_TRUE);
- evas_obj_image_scene_set(image, data.scene);
+ efl_canvas_scene3d_set(image, data.scene);
evas_object_size_hint_weight_set(image, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(image, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/lib/elc_combobox.c b/src/lib/elc_combobox.c
index 6899543..65e8205 100644
--- a/src/lib/elc_combobox.c
+++ b/src/lib/elc_combobox.c
@@ -369,7 +369,7 @@ _elm_combobox_multiple_selection_set(Eo *obj, Elm_Combobox_Data *pd,
if (enabled)
{
// This is multibuttonentry object that will take over the MBE call
- eo_add(&pd->mbe,ELM_MULTIBUTTONENTRY_CLASS, obj);
+ pd->mbe = eo_add(ELM_MULTIBUTTONENTRY_CLASS, obj);
evas_object_size_hint_weight_set(pd->mbe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(pd->mbe, EVAS_HINT_FILL, EVAS_HINT_FILL);
eo_event_callback_array_add(elm_multibuttonentry_entry_get(pd->mbe), entry_callbacks(), obj);
@@ -409,8 +409,7 @@ EAPI Evas_Object *
elm_combobox_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -433,7 +432,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
sd->hover_parent = elm_object_parent_widget_get(obj);
//hover
- eo_add(&sd->hover, ELM_HOVER_CLASS, sd->hover_parent);
+ sd->hover = eo_add(ELM_HOVER_CLASS, sd->hover_parent);
elm_widget_mirrored_automatic_set(sd->hover, EINA_FALSE);
elm_hover_target_set(sd->hover, obj);
snprintf(buf, sizeof(buf), "combobox_vertical/%s",
@@ -458,8 +457,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
elm_table_pack(sd->tbl, sd->spacer, 0, 0, 1, 1);
// This is the genlist object that will take over the genlist call
- eo_add(&gl, ELM_GENLIST_CLASS, obj);
- sd->genlist = gl;
+ sd->genlist = gl = eo_add(ELM_GENLIST_CLASS, obj);
elm_genlist_filter_set(gl, NULL);
elm_widget_mirrored_automatic_set(gl, EINA_FALSE);
elm_widget_mirrored_set(gl, elm_widget_mirrored_get(obj));
@@ -473,8 +471,7 @@ _elm_combobox_eo_base_constructor(Eo *obj, Elm_Combobox_Data *sd)
elm_table_pack(sd->tbl, gl, 0, 0, 1, 1);
// This is the entry object that will take over the entry call
- eo_add(&entry, ELM_ENTRY_CLASS, obj);
- sd->entry = entry;
+ sd->entry = entry = eo_add(ELM_ENTRY_CLASS, obj);
elm_widget_mirrored_automatic_set(entry, EINA_FALSE);
elm_widget_mirrored_set(entry, elm_widget_mirrored_get(obj));
elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_OFF,
diff --git a/src/lib/elc_combobox.h b/src/lib/elc_combobox.h
index 8237b87..006280b 100644
--- a/src/lib/elc_combobox.h
+++ b/src/lib/elc_combobox.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Combobox Combobox
+ * @defgroup Elm_Combobox Combobox
* @ingroup Elementary
*
* @image html combobox_inheritance_tree.png
diff --git a/src/lib/elc_combobox_legacy.h b/src/lib/elc_combobox_legacy.h
index 0719c78..21e888f 100644
--- a/src/lib/elc_combobox_legacy.h
+++ b/src/lib/elc_combobox_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Combobox
+ * @ingroup Elm_Combobox
*/
EAPI Evas_Object *elm_combobox_add(Evas_Object *parent);
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index db8804d..89bbefa 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1176,8 +1176,7 @@ EAPI Evas_Object *
elm_ctxpopup_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
/* access: parent could be any object such as elm_list which does
not know elc_ctxpopup as its child object in the focus_next(); */
@@ -1281,7 +1280,7 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Eva
{
Eo *eo_item;
- eo_add(&eo_item, ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_item, func, data));
+ eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
if (!eo_item) return NULL;
ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
@@ -1375,7 +1374,7 @@ _elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label, Ev
{
Eo *eo_item;
- eo_add(&eo_item, ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_item, func, data));
+ eo_item = eo_add(ELM_CTXPOPUP_ITEM_CLASS, obj, elm_obj_ctxpopup_item_init(eo_self, func, data));
if (!eo_item) return NULL;
ELM_CTXPOPUP_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h
index 0cde2b6..7d05a68 100644
--- a/src/lib/elc_ctxpopup.h
+++ b/src/lib/elc_ctxpopup.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Ctxpopup Ctxpopup
+ * @defgroup Elm_Ctxpopup Ctxpopup
* @ingroup Elementary
*
* @image html ctxpopup_inheritance_tree.png
diff --git a/src/lib/elc_ctxpopup_legacy.h b/src/lib/elc_ctxpopup_legacy.h
index 346589c..cf3ad28 100644
--- a/src/lib/elc_ctxpopup_legacy.h
+++ b/src/lib/elc_ctxpopup_legacy.h
@@ -4,7 +4,7 @@
* @param parent Parent object
* @return New object or @c NULL, if it cannot be created
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EAPI Evas_Object *elm_ctxpopup_add(Evas_Object *parent);
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 2452a11..36680ec 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1624,8 +1624,7 @@ EAPI Evas_Object *
elm_fileselector_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_fileselector.h b/src/lib/elc_fileselector.h
index 9ecd561..a2c3e19 100644
--- a/src/lib/elc_fileselector.h
+++ b/src/lib/elc_fileselector.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Fileselector File Selector
+ * @defgroup Elm_Fileselector File Selector
* @ingroup Elementary
*
* @image html fileselector_inheritance_tree.png
@@ -64,7 +64,7 @@
*/
/**
- * @addtogroup Fileselector
+ * @addtogroup Elm_Fileselector
* @{
*/
diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c
index 403119e..412aefd 100644
--- a/src/lib/elc_fileselector_button.c
+++ b/src/lib/elc_fileselector_button.c
@@ -215,8 +215,7 @@ EAPI Evas_Object *
elm_fileselector_button_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_fileselector_button.h b/src/lib/elc_fileselector_button.h
index c7b268a..a60f981 100644
--- a/src/lib/elc_fileselector_button.h
+++ b/src/lib/elc_fileselector_button.h
@@ -1,5 +1,5 @@
/**
- * @defgroup File_Selector_Button File Selector Button
+ * @defgroup Elm_File_Selector_Button File Selector Button
* @ingroup Elementary
*
* @image html fileselector_button_inheritance_tree.png
diff --git a/src/lib/elc_fileselector_button_legacy.h b/src/lib/elc_fileselector_button_legacy.h
index 0bc2860..54c2bac 100644
--- a/src/lib/elc_fileselector_button_legacy.h
+++ b/src/lib/elc_fileselector_button_legacy.h
@@ -6,7 +6,7 @@
* @return a new file selector button widget handle or @c NULL, on
* errors
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent);
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index e2fd6b2..85bb72e 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -342,8 +342,7 @@ EAPI Evas_Object *
elm_fileselector_entry_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_fileselector_entry.h b/src/lib/elc_fileselector_entry.h
index 49e0f18..5e8f643 100644
--- a/src/lib/elc_fileselector_entry.h
+++ b/src/lib/elc_fileselector_entry.h
@@ -1,5 +1,5 @@
/**
- * @defgroup File_Selector_Entry File Selector Entry
+ * @defgroup Elm_File_Selector_Entry File Selector Entry
* @ingroup Elementary
*
* @image html fileselector_entry_inheritance_tree.png
diff --git a/src/lib/elc_fileselector_entry_legacy.h b/src/lib/elc_fileselector_entry_legacy.h
index 72f96b9..f4f9b98 100644
--- a/src/lib/elc_fileselector_entry_legacy.h
+++ b/src/lib/elc_fileselector_entry_legacy.h
@@ -7,7 +7,7 @@
* @return a new file selector entry widget handle or @c NULL, on
* errors
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EAPI Evas_Object *elm_fileselector_entry_add(Evas_Object *parent);
diff --git a/src/lib/elc_fileselector_eo.h b/src/lib/elc_fileselector_eo.h
index dfc85c2..68277bc 100644
--- a/src/lib/elc_fileselector_eo.h
+++ b/src/lib/elc_fileselector_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*
* @{
*/
diff --git a/src/lib/elc_fileselector_legacy.h b/src/lib/elc_fileselector_legacy.h
index 88c1ef3..426a707 100644
--- a/src/lib/elc_fileselector_legacy.h
+++ b/src/lib/elc_fileselector_legacy.h
@@ -8,7 +8,7 @@
*
* This function inserts a new file selector widget on the canvas.
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
@@ -27,7 +27,7 @@ EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
*
* @see elm_fileselector_is_save_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_is_save_set(Evas_Object *obj, Eina_Bool is_save);
@@ -40,7 +40,7 @@ EAPI void elm_fileselector_is_save_set(Evas_Object *obj, Eina_B
*
* @see elm_fileselector_is_save_set() for more details
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_is_save_get(const Evas_Object *obj);
@@ -57,7 +57,7 @@ EAPI Eina_Bool elm_fileselector_is_save_get(const Evas_Object *obj);
*
* @see elm_fileselector_folder_only_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_folder_only_set(Evas_Object *obj, Eina_Bool only);
@@ -72,7 +72,7 @@ EAPI void elm_fileselector_folder_only_set(Evas_Object *obj, Ei
*
* @see elm_fileselector_folder_only_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_folder_only_get(const Evas_Object *obj);
@@ -92,7 +92,7 @@ EAPI Eina_Bool elm_fileselector_folder_only_get(const Evas_Object *o
*
* @see elm_fileselector_expandable_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool expand);
@@ -106,7 +106,7 @@ EAPI void elm_fileselector_expandable_set(Evas_Object *obj, Ein
*
* @see elm_fileselector_expandable_set() for more details
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_expandable_get(const Evas_Object *obj);
@@ -123,7 +123,7 @@ EAPI Eina_Bool elm_fileselector_expandable_get(const Evas_Object *ob
*
* @see elm_fileselector_path_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_path_set(Evas_Object *obj, const char *path);
@@ -137,7 +137,7 @@ EAPI void elm_fileselector_path_set(Evas_Object *obj, const cha
*
* @see elm_fileselector_path_set()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI const char *elm_fileselector_path_get(const Evas_Object *obj);
@@ -163,7 +163,7 @@ EAPI const char *elm_fileselector_path_get(const Evas_Object *obj);
* @see elm_fileselector_expandable_set().
* @see elm_fileselector_mode_get().
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_mode_set(Evas_Object *obj, Elm_Fileselector_Mode mode);
@@ -176,7 +176,7 @@ EAPI void elm_fileselector_mode_set(Evas_Object *obj, Elm_Files
*
* @see elm_fileselector_mode_set() for more details
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj);
@@ -195,7 +195,7 @@ EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj);
* @see elm_fileselector_multi_select_get()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_multi_select_set(Evas_Object *obj, Eina_Bool multi);
@@ -209,7 +209,7 @@ EAPI void elm_fileselector_multi_select_set(Evas_Object *obj, E
* @see elm_fileselector_multi_select_set()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_multi_select_get(const Evas_Object *obj);
@@ -225,7 +225,7 @@ EAPI Eina_Bool elm_fileselector_multi_select_get(const Evas_Object *
*
* @see elm_fileselector_selected_get()
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const char *path);
@@ -242,7 +242,7 @@ EAPI Eina_Bool elm_fileselector_selected_set(Evas_Object *obj, const
*
* @see elm_fileselector_selected_set() for more details
*
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI const char *elm_fileselector_selected_get(const Evas_Object *obj);
@@ -268,7 +268,7 @@ EAPI const char *elm_fileselector_current_name_get(const Evas_Object *
* @see elm_fileselector_selected_get()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI const Eina_List *elm_fileselector_selected_paths_get(const Evas_Object *obj);
@@ -288,7 +288,7 @@ EAPI const Eina_List *elm_fileselector_selected_paths_get(const Evas_Object
* @see elm_fileselector_filters_clear()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char *mime_types, const char *filter_name);
@@ -304,7 +304,7 @@ EAPI Eina_Bool elm_fileselector_mime_types_filter_append(Evas_Object
* @note first added filter will be the default filter at the moment.
*
* @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_custom_filter_append(Evas_Object *obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name);
@@ -319,7 +319,7 @@ EAPI Eina_Bool elm_fileselector_custom_filter_append(Evas_Object *ob
* @see elm_fileselector_mime_type_filter_append()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_filters_clear(Evas_Object *obj);
@@ -334,7 +334,7 @@ EAPI void elm_fileselector_filters_clear(Evas_Object *obj);
* files/directories in the list/grid of the file selector widget.
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_hidden_visible_set(Evas_Object *obj, Eina_Bool visible);
@@ -348,7 +348,7 @@ EAPI void elm_fileselector_hidden_visible_set(Evas_Object *obj,
* @see elm_fileselector_hidden_visible_set()
*
* @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Eina_Bool elm_fileselector_hidden_visible_get(const Evas_Object *obj);
@@ -364,7 +364,7 @@ EAPI Eina_Bool elm_fileselector_hidden_visible_get(const Evas_Object
* @see elm_fileselector_thumbnail_size_get()
*
* @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_thumbnail_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
@@ -381,7 +381,7 @@ EAPI void elm_fileselector_thumbnail_size_set(Evas_Object *obj,
* @see elm_fileselector_thumbnail_size_set()
*
* @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_thumbnail_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
@@ -394,7 +394,7 @@ EAPI void elm_fileselector_thumbnail_size_get(const Evas_Object
* @see elm_fileselector_sort_method_set()
*
* @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI Elm_Fileselector_Sort elm_fileselector_sort_method_get(const Evas_Object *obj);
@@ -407,7 +407,7 @@ EAPI Elm_Fileselector_Sort elm_fileselector_sort_method_get(const Evas_Object *o
* @see elm_fileselector_sort_method_get()
*
* @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
*/
EAPI void elm_fileselector_sort_method_set(Evas_Object *obj, Elm_Fileselector_Sort sort);
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 8a13df1..e14e0e6 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -611,8 +611,7 @@ EAPI Evas_Object *
elm_hoversel_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -749,8 +748,7 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
Evas_Object *bt, *ic;
char buf[4096];
- Eo *eo_item = NULL;
- eo_add(&eo_item, ELM_HOVERSEL_ITEM_CLASS, obj);
+ Eo *eo_item = eo_add(ELM_HOVERSEL_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_HOVERSEL_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elc_hoversel.h b/src/lib/elc_hoversel.h
index 8296c16..50a7899 100644
--- a/src/lib/elc_hoversel.h
+++ b/src/lib/elc_hoversel.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Hoversel Hoversel
+ * @defgroup Elm_Hoversel Hoversel
* @ingroup Elementary
*
* @image html hoversel_inheritance_tree.png
diff --git a/src/lib/elc_hoversel_legacy.h b/src/lib/elc_hoversel_legacy.h
index 6701171..89e6f9b 100644
--- a/src/lib/elc_hoversel_legacy.h
+++ b/src/lib/elc_hoversel_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Hoversel
+ * @ingroup Elm_Hoversel
*/
EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index d05ca76..a154571 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -746,7 +746,7 @@ _item_new(Elm_Multibuttonentry_Data *sd,
return NULL;
}
- eo_add(&eo_item, ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_MULTIBUTTONENTRY_ITEM_CLASS, obj);
if (!eo_item)
return NULL;
WIDGET_ITEM_DATA_SET(eo_item, data);
@@ -1706,8 +1706,7 @@ EAPI Evas_Object *
elm_multibuttonentry_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 757ffc7..bb22c75 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -1209,7 +1209,7 @@ _item_new(Evas_Object *obj,
ELM_NAVIFRAME_DATA_GET(obj, sd);
- eo_add(&eo_item, ELM_NAVIFRAME_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
if (!eo_item)
{
@@ -1583,8 +1583,7 @@ EAPI Evas_Object *
elm_naviframe_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_naviframe.h b/src/lib/elc_naviframe.h
index f4c4a27..d99c842 100644
--- a/src/lib/elc_naviframe.h
+++ b/src/lib/elc_naviframe.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Naviframe Naviframe
+ * @defgroup Elm_Naviframe Naviframe
* @ingroup Elementary
*
* @image html naviframe_inheritance_tree.png
@@ -85,7 +85,7 @@
*/
/**
- * @addtogroup Naviframe
+ * @addtogroup Elm_Naviframe
* @{
*/
diff --git a/src/lib/elc_naviframe_common.h b/src/lib/elc_naviframe_common.h
index 01b87c5..525f995 100644
--- a/src/lib/elc_naviframe_common.h
+++ b/src/lib/elc_naviframe_common.h
@@ -17,7 +17,7 @@ typedef Eina_Bool (*Elm_Naviframe_Item_Pop_Cb)(void *data, Elm_Object_Item *it);
* @param parent Parent object
* @return New object or @c NULL, if it cannot be created
*
- * @ingroup Naviframe
+ * @ingroup Elm_Naviframe
*/
EAPI Evas_Object *elm_naviframe_add(Evas_Object *parent);
diff --git a/src/lib/elc_naviframe_eo.h b/src/lib/elc_naviframe_eo.h
index 8d3cfe2..29093b7 100644
--- a/src/lib/elc_naviframe_eo.h
+++ b/src/lib/elc_naviframe_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Naviframe
+ * @ingroup Elm_Naviframe
*
* @{
*/
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index e19a8e9..7c1e2a7 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -714,8 +714,7 @@ EAPI Evas_Object *
elm_player_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 89eeaa6..c69e16d 100644
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -1574,8 +1574,7 @@ EAPI Evas_Object *
elm_popup_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
wd->highlight_root = EINA_TRUE;
@@ -1753,7 +1752,7 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const char *label, Evas_Obje
Evas_Object *prev_content;
Eo *eo_it;
- eo_add(&eo_it, ELM_POPUP_ITEM_CLASS, obj);
+ eo_it = eo_add(ELM_POPUP_ITEM_CLASS, obj);
if (!eo_it) return NULL;
ELM_POPUP_ITEM_DATA_GET(eo_it, it);
if (sd->content || sd->text_content_obj)
diff --git a/src/lib/elc_popup.h b/src/lib/elc_popup.h
index d672db2..311869f 100644
--- a/src/lib/elc_popup.h
+++ b/src/lib/elc_popup.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Popup Popup
+ * @defgroup Elm_Popup Popup
* @ingroup Elementary
*
* @image html popup_inheritance_tree.png
diff --git a/src/lib/elc_popup_eo.h b/src/lib/elc_popup_eo.h
index 880be9c..254a876 100644
--- a/src/lib/elc_popup_eo.h
+++ b/src/lib/elc_popup_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Popup
+ * @ingroup Elm_Popup
*
* @{
*/
diff --git a/src/lib/elc_popup_legacy.h b/src/lib/elc_popup_legacy.h
index 8ba86cf..027edbd 100644
--- a/src/lib/elc_popup_legacy.h
+++ b/src/lib/elc_popup_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Popup
+ * @ingroup Elm_Popup
*/
EAPI Evas_Object *elm_popup_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 25c665f..6e9a829 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1235,8 +1235,7 @@ static Evas_Object *
_elm_access_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 47a7167..7e609e6 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -531,8 +531,7 @@ EAPI Evas_Object *
elm_actionslider_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h
index 91868f8..74f3967 100644
--- a/src/lib/elm_actionslider.h
+++ b/src/lib/elm_actionslider.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Actionslider Actionslider
+ * @addtogroup Elm_Actionslider Actionslider
* @ingroup Elementary
*
* @image html actionslider_inheritance_tree.png
diff --git a/src/lib/elm_actionslider_legacy.h b/src/lib/elm_actionslider_legacy.h
index 2ae13f2..60512fd 100644
--- a/src/lib/elm_actionslider_legacy.h
+++ b/src/lib/elm_actionslider_legacy.h
@@ -4,8 +4,8 @@
* @param parent The parent object
* @return The new actionslider object or NULL if it cannot be created
*
- * @ingroup Actionslider
+ * @ingroup Elm_Actionslider
*/
EAPI Evas_Object *elm_actionslider_add(Evas_Object *parent);
-#include "elm_actionslider.eo.legacy.h" \ No newline at end of file
+#include "elm_actionslider.eo.legacy.h"
diff --git a/src/lib/elm_app.h b/src/lib/elm_app.h
index 76c663b..a169f7c 100644
--- a/src/lib/elm_app.h
+++ b/src/lib/elm_app.h
@@ -1,5 +1,5 @@
/**
- * @defgroup App App
+ * @defgroup Elm_App App
* @ingroup Elementary
* Provide information in order to make Elementary determine the @b
* run time location of the software in question, so other data files
@@ -8,7 +8,7 @@
*/
/**
- * @addtogroup App
+ * @addtogroup Elm_App
* @{
*/
@@ -82,7 +82,7 @@
* @see elm_app_data_dir_get()
* @see elm_app_locale_dir_get()
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI void elm_app_info_set(void *mainfunc, const char *dom, const char *checkfile);
@@ -91,7 +91,7 @@ EAPI void elm_app_info_set(void *mainfunc, const char *dom, const char *c
*
* @param name Application name.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.8
*/
EAPI void elm_app_name_set(const char *name);
@@ -105,7 +105,7 @@ EAPI void elm_app_name_set(const char *name);
* @warning Since this path is very environment dependent,
* this will hold whatever value is passed to it.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.8
*/
EAPI void elm_app_desktop_entry_set(const char *path);
@@ -126,7 +126,7 @@ EAPI void elm_app_desktop_entry_set(const char *path);
* @warning You should call this function @b before
* elm_app_info_set().
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI void elm_app_compile_bin_dir_set(const char *dir);
@@ -146,7 +146,7 @@ EAPI void elm_app_compile_bin_dir_set(const char *dir);
* @warning You should call this function @b before
* elm_app_info_set().
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI void elm_app_compile_lib_dir_set(const char *dir);
@@ -166,7 +166,7 @@ EAPI void elm_app_compile_lib_dir_set(const char *dir);
* @warning You should call this function @b before
* elm_app_info_set().
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI void elm_app_compile_data_dir_set(const char *dir);
@@ -181,7 +181,7 @@ EAPI void elm_app_compile_data_dir_set(const char *dir);
* @warning You should call this function @b before
* elm_app_info_set().
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI void elm_app_compile_locale_set(const char *dir);
@@ -190,7 +190,7 @@ EAPI void elm_app_compile_locale_set(const char *dir);
*
* @return The application formal name.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.8
*/
EAPI const char *elm_app_name_get(void);
@@ -201,7 +201,7 @@ EAPI const char *elm_app_name_get(void);
*
* @return The '.desktop' file path.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.8
*/
EAPI const char *elm_app_desktop_entry_get(void);
@@ -213,7 +213,7 @@ EAPI const char *elm_app_desktop_entry_get(void);
*
* @return The directory prefix the application is actually using.
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI const char *elm_app_prefix_dir_get(void);
@@ -225,7 +225,7 @@ EAPI const char *elm_app_prefix_dir_get(void);
* @return The binaries directory prefix the application is actually
* using.
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI const char *elm_app_bin_dir_get(void);
@@ -237,7 +237,7 @@ EAPI const char *elm_app_bin_dir_get(void);
* @return The libraries directory prefix the application is actually
* using.
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI const char *elm_app_lib_dir_get(void);
@@ -249,7 +249,7 @@ EAPI const char *elm_app_lib_dir_get(void);
* @return The data directory prefix the application is actually
* using.
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI const char *elm_app_data_dir_get(void);
@@ -261,7 +261,7 @@ EAPI const char *elm_app_data_dir_get(void);
* @return The locale directory prefix the application is actually
* using.
*
- * @ingroup App
+ * @ingroup Elm_App
*/
EAPI const char *elm_app_locale_dir_get(void);
@@ -277,7 +277,7 @@ EAPI const char *elm_app_locale_dir_get(void);
*
* @note You should call this function @b before using ELM_SCALE_SIZE macro.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.12
*/
EAPI void elm_app_base_scale_set(double base_scale);
@@ -287,7 +287,7 @@ EAPI void elm_app_base_scale_set(double base_scale);
*
* @return The base scale which the application sets.
*
- * @ingroup App
+ * @ingroup Elm_App
* @since 1.12
*/
EAPI double elm_app_base_scale_get(void);
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index c1f007e..fcdee64 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -37,7 +37,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
if (view)
continue;
- eo_add(&view, ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(view, obj_path));
+ view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, obj_path));
eina_hash_add(data->views, obj_path, view);
if (!loading_list)
eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
@@ -211,7 +211,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
view = eina_hash_find(cdata->views, view_path);
if (!view)
{
- eo_add(&view, ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(view, view_path));
+ view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo, elm_app_client_view_path_set(eo_self, view_path));
eina_hash_add(cdata->views, view_path, view);
eo_event_callback_call(eo, ELM_APP_CLIENT_EVENT_VIEW_CREATED, view);
}
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 0802b65..3db9909 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -255,7 +255,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
new_events = elm_app_server_view_props_new_events_get(view_eet_props);
progress = elm_app_server_view_props_progress_get(view_eet_props);
- eo_add(&view, ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(view, view_id));
+ view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj, elm_app_server_view_id_set(eo_self, view_id));
if (!view)
continue;
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index e56b98d..3709b9c 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -4443,7 +4443,7 @@ _elm_atspi_bridge_init(void)
{
if (!_init_count)
{
- eo_add(&_instance, ELM_ATSPI_BRIDGE_CLASS, NULL);
+ _instance = eo_add(ELM_ATSPI_BRIDGE_CLASS, NULL);
_init_count = 1;
}
}
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index fc503c8..1c709b2 100644
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -113,8 +113,7 @@ EAPI Evas_Object *
elm_bg_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_bg.h b/src/lib/elm_bg.h
index b41a96d..0a93268 100644
--- a/src/lib/elm_bg.h
+++ b/src/lib/elm_bg.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Bg Background
+ * @defgroup Elm_Bg Background
* @ingroup Elementary
*
* @image html bg_inheritance_tree.png
diff --git a/src/lib/elm_bg_legacy.h b/src/lib/elm_bg_legacy.h
index f6f3f3e..a46cc7b 100644
--- a/src/lib/elm_bg_legacy.h
+++ b/src/lib/elm_bg_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or @c NULL if it cannot be created
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EAPI Evas_Object *elm_bg_add(Evas_Object *parent);
@@ -27,7 +27,7 @@ EAPI Evas_Object *elm_bg_add(Evas_Object *parent);
*
* @see elm_bg_color_get()
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EAPI void elm_bg_color_set(Evas_Object *obj, int r, int g, int b);
@@ -44,7 +44,7 @@ EAPI void elm_bg_color_set(Evas_Object *obj, int r, int
*
* @see elm_bg_color_get() for more details
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EAPI void elm_bg_color_get(const Evas_Object *obj, int *r, int *g, int *b);
@@ -70,7 +70,7 @@ EAPI void elm_bg_color_get(const Evas_Object *obj, int *
* achieve the @c Layout's file setting behavior, you'll have to call
* that method on this object.
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*
* @param[in] file The file path
* @param[in] group Optional key (group in Edje) within the file
@@ -84,7 +84,7 @@ EAPI Eina_Bool elm_bg_file_set(Eo *obj, const char *file, const char *group);
* @note Use @c NULL pointers on the file components you're not
* interested in: they'll be ignored by the function.
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*
* @param[out] file The file path
* @param[out] group Optional key (group in Edje) within the file
diff --git a/src/lib/elm_box.c b/src/lib/elm_box.c
index 133132a..f3fbd6f 100644
--- a/src/lib/elm_box.c
+++ b/src/lib/elm_box.c
@@ -436,8 +436,7 @@ EAPI Evas_Object *
elm_box_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_box.h b/src/lib/elm_box.h
index 3f47987..ba9f501 100644
--- a/src/lib/elm_box.h
+++ b/src/lib/elm_box.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Box Box
+ * @defgroup Elm_Box Box
* @ingroup Elementary
*
* @image html box_inheritance_tree.png
diff --git a/src/lib/elm_box_common.h b/src/lib/elm_box_common.h
index 2aefa37..977501a 100644
--- a/src/lib/elm_box_common.h
+++ b/src/lib/elm_box_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Box
+ * @addtogroup Elm_Box
*
* @{
*/
diff --git a/src/lib/elm_box_legacy.h b/src/lib/elm_box_legacy.h
index c0fab71..e37f020 100644
--- a/src/lib/elm_box_legacy.h
+++ b/src/lib/elm_box_legacy.h
@@ -6,7 +6,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Box
+ * @ingroup Elm_Box
*/
EAPI Evas_Object *elm_box_add(Evas_Object *parent);
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 5c3a644..ba83049 100644
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -219,8 +219,7 @@ EAPI Evas_Object *
elm_bubble_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_bubble.h b/src/lib/elm_bubble.h
index f0ca62c..f96308b 100644
--- a/src/lib/elm_bubble.h
+++ b/src/lib/elm_bubble.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Bubble Bubble
+ * @defgroup Elm_Bubble Bubble
* @ingroup Elementary
*
* @image html bubble_inheritance_tree.png
diff --git a/src/lib/elm_bubble_legacy.h b/src/lib/elm_bubble_legacy.h
index a0b3e36..fe19303 100644
--- a/src/lib/elm_bubble_legacy.h
+++ b/src/lib/elm_bubble_legacy.h
@@ -6,7 +6,7 @@
*
* This function adds a text bubble to the given parent evas object.
*
- * @ingroup Bubble
+ * @ingroup Elm_Bubble
*/
EAPI Evas_Object *elm_bubble_add(Evas_Object *parent);
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 5fc7e75..9de31b7 100644
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -324,8 +324,7 @@ EAPI Evas_Object *
elm_button_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_button.h b/src/lib/elm_button.h
index 72b6c74..0df901f 100644
--- a/src/lib/elm_button.h
+++ b/src/lib/elm_button.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Button Button
+ * @defgroup Elm_Button Button
* @ingroup Elementary
*
* @image html button_inheritance_tree.png
@@ -63,7 +63,7 @@
*/
/**
- * @addtogroup Button
+ * @addtogroup Elm_Button
* @{
*/
diff --git a/src/lib/elm_button_legacy.h b/src/lib/elm_button_legacy.h
index b78a868..7901823 100644
--- a/src/lib/elm_button_legacy.h
+++ b/src/lib/elm_button_legacy.h
@@ -4,8 +4,8 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Button
+ * @ingroup Elm_Button
*/
EAPI Evas_Object *elm_button_add(Evas_Object *parent);
-#include "elm_button.eo.legacy.h" \ No newline at end of file
+#include "elm_button.eo.legacy.h"
diff --git a/src/lib/elm_cache.h b/src/lib/elm_cache.h
index 7546f6b..d78113e 100644
--- a/src/lib/elm_cache.h
+++ b/src/lib/elm_cache.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Caches Caches
+ * @defgroup Elm_Caches Caches
* @ingroup Elementary
*
* These are functions which let one fine-tune some cache values for
@@ -22,7 +22,7 @@
* @li evas_render_dump()
* @note Evas caches are flushed for every canvas associated with a window.
*
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI void elm_cache_all_flush(void);
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index bd5e119..af20e6f 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1583,8 +1583,7 @@ EAPI Evas_Object *
elm_calendar_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h
index b1a334f..f0fc828 100644
--- a/src/lib/elm_calendar.h
+++ b/src/lib/elm_calendar.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Calendar Calendar
+ * @defgroup Elm_Calendar Calendar
* @ingroup Elementary
*
* @image html calendar_inheritance_tree.png
@@ -44,7 +44,7 @@
*/
/**
- * @addtogroup Calendar
+ * @addtogroup Elm_Calendar
* @{
*/
diff --git a/src/lib/elm_calendar_common.h b/src/lib/elm_calendar_common.h
index 52381dc..e044452 100644
--- a/src/lib/elm_calendar_common.h
+++ b/src/lib/elm_calendar_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Calendar
+ * @addtogroup Elm_Calendar
*
* @{
*/
diff --git a/src/lib/elm_calendar_legacy.h b/src/lib/elm_calendar_legacy.h
index be54a5d..ddc8ac0 100644
--- a/src/lib/elm_calendar_legacy.h
+++ b/src/lib/elm_calendar_legacy.h
@@ -11,7 +11,7 @@
*
* @ref calendar_example_01
*
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
*/
EAPI Evas_Object *elm_calendar_add(Evas_Object *parent);
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index a28be74..024e3da 100644
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -371,8 +371,7 @@ EAPI Evas_Object *
elm_check_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_check.h b/src/lib/elm_check.h
index 51a57f2..dfac2f7 100644
--- a/src/lib/elm_check.h
+++ b/src/lib/elm_check.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Check Check
+ * @defgroup Elm_Check Check
* @ingroup Elementary
*
* @image html check_inheritance_tree.png
diff --git a/src/lib/elm_check_legacy.h b/src/lib/elm_check_legacy.h
index 742881d..a6653c3 100644
--- a/src/lib/elm_check_legacy.h
+++ b/src/lib/elm_check_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Check
+ * @ingroup Elm_Check
*/
EAPI Evas_Object * elm_check_add(Evas_Object *parent);
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index e832cd9..a5f8a0b 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -790,8 +790,7 @@ EAPI Evas_Object *
elm_clock_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_clock.h b/src/lib/elm_clock.h
index 7ba9285..138d39c 100644
--- a/src/lib/elm_clock.h
+++ b/src/lib/elm_clock.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Clock Clock
+ * @defgroup Elm_Clock Clock
* @ingroup Elementary
*
* @image html clock_inheritance_tree.png
@@ -53,7 +53,7 @@
*/
/**
- * @addtogroup Clock
+ * @addtogroup Elm_Clock
* @{
*/
diff --git a/src/lib/elm_clock_legacy.h b/src/lib/elm_clock_legacy.h
index 914ecbd..22381ac 100644
--- a/src/lib/elm_clock_legacy.h
+++ b/src/lib/elm_clock_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new clock widget on the canvas.
*
- * @ingroup Clock
+ * @ingroup Elm_Clock
*/
EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
diff --git a/src/lib/elm_color_class.h b/src/lib/elm_color_class.h
index cbcd6a3..97a5031 100644
--- a/src/lib/elm_color_class.h
+++ b/src/lib/elm_color_class.h
@@ -76,6 +76,6 @@ EAPI void elm_color_class_list_cb_set(Elm_Color_Class_List_Cb cb);
* @since 1.14
**/
EAPI Eina_List *elm_color_class_util_edje_file_list(Eina_File *f);
-/** }@ */
+/** @} */
#endif
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 1fbabad..ca2ae72 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1781,7 +1781,7 @@ _palette_colors_load(Evas_Object *obj)
EINA_LIST_FOREACH(color_list, elist, color)
{
- eo_add(&eo_item, ELM_COLOR_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_COLOR_ITEM_CLASS, obj);
if (!eo_item) return;
ELM_COLOR_ITEM_DATA_GET(eo_item, item);
@@ -2217,8 +2217,7 @@ EAPI Evas_Object *
elm_colorselector_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -2397,7 +2396,7 @@ _elm_colorselector_palette_color_add(Eo *obj, Elm_Colorselector_Data *sd, int r,
_items_del(sd);
sd->config_load = EINA_FALSE;
}
- eo_add(&eo_item, ELM_COLOR_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_COLOR_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_COLOR_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elm_colorselector.h b/src/lib/elm_colorselector.h
index b98f414..ffce041 100644
--- a/src/lib/elm_colorselector.h
+++ b/src/lib/elm_colorselector.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Colorselector Colorselector
+ * @defgroup Elm_Colorselector Colorselector
* @ingroup Elementary
*
* @image html colorselector_inheritance_tree.png
diff --git a/src/lib/elm_colorselector_common.h b/src/lib/elm_colorselector_common.h
index ecce64d..3902173 100644
--- a/src/lib/elm_colorselector_common.h
+++ b/src/lib/elm_colorselector_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Colorselector
+ * @addtogroup Elm_Colorselector
*
* @{
*/
diff --git a/src/lib/elm_colorselector_legacy.h b/src/lib/elm_colorselector_legacy.h
index 90ae6f2..27008db 100644
--- a/src/lib/elm_colorselector_legacy.h
+++ b/src/lib/elm_colorselector_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Colorselector
+ * @ingroup Elm_Colorselector
*/
EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 2176432..6bb1363 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -1727,8 +1727,8 @@ _config_load(void)
_elm_config->thumbscroll_border_friction = 0.5;
_elm_config->thumbscroll_sensitivity_friction = 0.25; // magic number! just trial and error shows this makes it behave "nicer" and not run off at high speed all the time
_elm_config->scroll_smooth_start_enable = EINA_TRUE;
- _elm_config->scroll_smooth_start_enable = EINA_FALSE;
- _elm_config->scroll_smooth_amount = 7.0;
+ _elm_config->scroll_animation_disable = EINA_FALSE;
+ _elm_config->scroll_accel_factor = 7.0;
// _elm_config->scroll_smooth_time_interval = 0.008; // not used anymore
_elm_config->scroll_smooth_amount = 1.0;
// _elm_config->scroll_smooth_history_weight = 0.3; // not used anymore
@@ -3103,6 +3103,7 @@ EAPI void
elm_config_focus_move_policy_set(Elm_Focus_Move_Policy policy)
{
_elm_config->focus_move_policy = policy;
+ _elm_win_focus_reconfigure();
}
EAPI Eina_Bool
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 0283dfc..023564f 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Config Elementary Config
+ * @defgroup Elm_Config Elementary Config
* @ingroup Elementary
*
* Elementary configuration is formed by a set options bounded to a
@@ -17,7 +17,7 @@
* future sessions.
*
* @return @c EINA_TRUE, when successful. @c EINA_FALSE, otherwise.
- * @ingroup Config
+ * @ingroup Elm_Config
*
* This function will take effect -- thus, do I/O -- immediately. Use
* it when you want to save all configuration changes at once. The
@@ -32,7 +32,7 @@ EAPI Eina_Bool elm_config_save(void);
* profile.
*
* @return @c EINA_TRUE, when successful. @c EINA_FALSE, otherwise.
- * @ingroup Config
+ * @ingroup Elm_Config
*
* Useful when you want to force reloading of configuration values for
* a profile. If one removes user custom configuration directories,
@@ -45,7 +45,7 @@ EAPI void elm_config_reload(void);
* Flush all config settings then apply those settings to all applications
* using elementary on the current display.
*
- * @ingroup Config
+ * @ingroup Elm_Config
*/
EAPI void elm_config_all_flush(void);
@@ -54,7 +54,7 @@ EAPI void elm_config_all_flush(void);
*/
/**
- * @defgroup Profile Elementary Profile
+ * @defgroup Elm_Profile Elementary Profile
* @ingroup Elementary
*
* Profiles are pre-set options that affect the whole look-and-feel of
@@ -74,7 +74,7 @@ EAPI void elm_config_all_flush(void);
* applications.
*
* @return The profile's name
- * @ingroup Profile
+ * @ingroup Elm_Profile
*/
EAPI const char *elm_config_profile_get(void);
@@ -87,7 +87,7 @@ EAPI const char *elm_config_profile_get(void);
* @param is_user Whether to lookup for a user profile (@c EINA_TRUE)
* or a system one (@c EINA_FALSE)
* @return The profile's directory path.
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @note You must free it with elm_config_profile_dir_free().
*/
@@ -98,7 +98,7 @@ EAPI const char *elm_config_profile_dir_get(const char *profile, Eina_Bool is_us
* elm_config_profile_dir_get().
*
* @param p_dir The profile's path
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
*/
EAPI void elm_config_profile_dir_free(const char *p_dir);
@@ -108,7 +108,7 @@ EAPI void elm_config_profile_dir_free(const char *p_dir);
*
* @return The profiles list. List node data are the profile name
* strings.
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @note One must free this list, after usage, with the function
* elm_config_profile_list_free().
@@ -123,7 +123,7 @@ EAPI Eina_List *elm_config_profile_list_get(void);
*
* @return The profiles list. List node data are the profile name
* strings.
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @note One must free this list, after usage, with the function
* elm_config_profile_list_free().
@@ -135,7 +135,7 @@ EAPI Eina_List *elm_config_profile_list_full_get(void);
* Free Elementary's list of available profiles.
*
* @param l The profiles list, as returned by elm_config_profile_list_get().
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
*/
EAPI void elm_config_profile_list_free(Eina_List *l);
@@ -145,7 +145,7 @@ EAPI void elm_config_profile_list_free(Eina_List *l);
*
* @return EINA_TRUE if the profile exists, or EINA_FALSE if not
* @param profile The profile's name
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @since 1.17
*/
@@ -159,7 +159,7 @@ EAPI Eina_Bool elm_config_profile_exists(const char *profile);
* affected.
*
* @param profile The profile's name
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
*/
EAPI void elm_config_profile_set(const char *profile);
@@ -172,7 +172,7 @@ EAPI void elm_config_profile_set(const char *profile);
* application or make other processes switch profile.
*
* @param profile The profile's name
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @since 1.17
*/
@@ -193,7 +193,7 @@ EAPI void elm_config_profile_save(const char *profile);
* @param derive_options A string of derive options detailing how to modify
*
* @see elm_config_profile_derived_del
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @since 1.17
*/
@@ -213,7 +213,7 @@ EAPI void elm_config_profile_derived_add(const char *profile, const char
* @param profile The profile's name that is to be deleted
*
* @see elm_config_profile_derived_add
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
* @since 1.17
*/
@@ -224,7 +224,7 @@ EAPI void elm_config_profile_derived_del(const char *profile);
*/
/**
- * @defgroup Scrolling Elementary Scrolling
+ * @defgroup Elm_Scrolling Elementary Scrolling
* @ingroup Elementary
*
* These are functions setting how scrollable views in Elementary
@@ -240,7 +240,7 @@ EAPI void elm_config_profile_derived_del(const char *profile);
* @return the thumb scroll bouncing state
*
* This is the default behavior for touch screens, in general.
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI Eina_Bool elm_config_scroll_bounce_enabled_get(void);
@@ -251,7 +251,7 @@ EAPI Eina_Bool elm_config_scroll_bounce_enabled_get(void);
* @param enabled the thumb scroll bouncing state
*
* @see elm_config_scroll_bounce_enabled_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled);
@@ -261,7 +261,7 @@ EAPI void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled);
*
* @return the thumb scroll bounce friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_bounce_friction_get(void);
@@ -272,7 +272,7 @@ EAPI double elm_config_scroll_bounce_friction_get(void);
* @param friction the thumb scroll bounce friction
*
* @see elm_config_scroll_bounce_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_bounce_friction_set(double friction);
@@ -282,7 +282,7 @@ EAPI void elm_config_scroll_bounce_friction_set(double friction);
*
* @return the page scroll friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_page_scroll_friction_get(void);
@@ -293,7 +293,7 @@ EAPI double elm_config_scroll_page_scroll_friction_get(void);
* @param friction the page scroll friction
*
* @see elm_config_scroll_page_scroll_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_page_scroll_friction_set(double friction);
@@ -301,7 +301,7 @@ EAPI void elm_config_scroll_page_scroll_friction_set(double friction);
* Get enable status of context menu disabled.
*
* @see elm_config_context_menu_disabled_set()
- * @ingroup Entry
+ * @ingroup Elm_Entry
* @since 1.17
*/
EAPI Eina_Bool elm_config_context_menu_disabled_get(void);
@@ -312,7 +312,7 @@ EAPI Eina_Bool elm_config_context_menu_disabled_get(void);
* @param disabled disable context menu if @c EINA_TRUE, enable otherwise
*
* @see elm_config_context_menu_disabled_get()
- * @ingroup Entry
+ * @ingroup Elm_Entry
* @since 1.17
*/
EAPI void elm_config_context_menu_disabled_set(Eina_Bool disabled);
@@ -323,7 +323,7 @@ EAPI void elm_config_context_menu_disabled_set(Eina_Bool disabled);
*
* @return the bring in scroll friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_bring_in_scroll_friction_get(void);
@@ -334,7 +334,7 @@ EAPI double elm_config_scroll_bring_in_scroll_friction_get(void);
* @param friction the bring in scroll friction
*
* @see elm_config_scroll_bring_in_scroll_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_bring_in_scroll_friction_set(double friction);
@@ -344,7 +344,7 @@ EAPI void elm_config_scroll_bring_in_scroll_friction_set(double friction
*
* @return the zoom friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_zoom_friction_get(void);
@@ -355,7 +355,7 @@ EAPI double elm_config_scroll_zoom_friction_get(void);
* @param friction the zoom friction
*
* @see elm_config_scroll_zoom_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_zoom_friction_set(double friction);
@@ -369,7 +369,7 @@ EAPI void elm_config_scroll_zoom_friction_set(double friction);
* @note All other functions namespaced with "thumbscroll" will only
* have effect if this mode is enabled.
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI Eina_Bool elm_config_scroll_thumbscroll_enabled_get(void);
@@ -380,7 +380,7 @@ EAPI Eina_Bool elm_config_scroll_thumbscroll_enabled_get(void);
* @param enabled the thumb scroll state
*
* @see elm_config_scroll_thumbscroll_enabled_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled);
@@ -392,7 +392,7 @@ EAPI void elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled);
*
* One would use higher values for touch screens, in general, because
* of their inherent imprecision.
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI unsigned int elm_config_scroll_thumbscroll_threshold_get(void);
@@ -403,7 +403,7 @@ EAPI unsigned int elm_config_scroll_thumbscroll_threshold_get(void);
* @param threshold the thumb scroll threshold
*
* @see elm_config_thumbscroll_threshold_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold);
@@ -413,7 +413,7 @@ EAPI void elm_config_scroll_thumbscroll_threshold_set(unsigned int thres
*
* @return the thumb scroll hold threshold
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI unsigned int elm_config_scroll_thumbscroll_hold_threshold_get(void);
@@ -424,7 +424,7 @@ EAPI unsigned int elm_config_scroll_thumbscroll_hold_threshold_get(void);
* @param threshold the thumb scroll hold threshold
*
* @see elm_config_thumbscroll_hold_threshold_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_hold_threshold_set(unsigned int threshold);
@@ -435,7 +435,7 @@ EAPI void elm_config_scroll_thumbscroll_hold_threshold_set(unsigned int
*
* @return the thumb scroll momentum threshold
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_momentum_threshold_get(void);
@@ -447,7 +447,7 @@ EAPI double elm_config_scroll_thumbscroll_momentum_threshold_get(void);
* @param threshold the thumb scroll momentum threshold
*
* @see elm_config_thumbscroll_momentum_threshold_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold);
@@ -458,7 +458,7 @@ EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double th
*
* @return the thumb scroll maximum flick distance
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI unsigned int elm_config_scroll_thumbscroll_flick_distance_tolerance_get(void);
@@ -470,7 +470,7 @@ EAPI unsigned int elm_config_scroll_thumbscroll_flick_distance_tolerance_get(voi
* @param distance the thumb scroll maximum flick distance
*
* @see elm_config_thumbscroll_flick_distance_tolerance_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_flick_distance_tolerance_set(unsigned int distance);
@@ -480,7 +480,7 @@ EAPI void elm_config_scroll_thumbscroll_flick_distance_tolerance_set(uns
*
* @return the thumb scroll friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_friction_get(void);
@@ -491,7 +491,7 @@ EAPI double elm_config_scroll_thumbscroll_friction_get(void);
* @param friction the thumb scroll friction
*
* @see elm_config_thumbscroll_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_friction_set(double friction);
@@ -501,7 +501,7 @@ EAPI void elm_config_scroll_thumbscroll_friction_set(double friction);
*
* @return the thumb scroll min friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_min_friction_get(void);
@@ -512,7 +512,7 @@ EAPI double elm_config_scroll_thumbscroll_min_friction_get(void);
* @param friction the thumb scroll min friction
*
* @see elm_config_thumbscroll_min_friction_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_min_friction_set(double friction);
@@ -523,7 +523,7 @@ EAPI void elm_config_scroll_thumbscroll_min_friction_set(double friction
*
* @return the thumb scroll friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_friction_standard_get(void);
@@ -535,7 +535,7 @@ EAPI double elm_config_scroll_thumbscroll_friction_standard_get(void);
* @param standard the thumb scroll friction standard
*
* @see elm_config_thumbscroll_friction_standard_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_friction_standard_set(double standard);
@@ -546,7 +546,7 @@ EAPI void elm_config_scroll_thumbscroll_friction_standard_set(double sta
*
* @return the thumb scroll border friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_border_friction_get(void);
@@ -562,7 +562,7 @@ EAPI double elm_config_scroll_thumbscroll_border_friction_get(void);
* @see elm_config_thumbscroll_border_friction_get()
* @note parameter value will get bound to 0.0 - 1.0 interval, always
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_border_friction_set(double friction);
@@ -572,7 +572,7 @@ EAPI void elm_config_scroll_thumbscroll_border_friction_set(double frict
*
* @return the thumb scroll sensitivity friction
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_sensitivity_friction_get(void);
@@ -587,7 +587,7 @@ EAPI double elm_config_scroll_thumbscroll_sensitivity_friction_get(void);
* @see elm_config_thumbscroll_sensitivity_friction_get()
* @note parameter value will get bound to 0.1 - 1.0 interval, always
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction);
@@ -599,7 +599,7 @@ EAPI void elm_config_scroll_thumbscroll_sensitivity_friction_set(double
* @see elm_config_scroll_thumbscroll_smooth_start_set()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI Eina_Bool elm_config_scroll_thumbscroll_smooth_start_get(void);
@@ -615,7 +615,7 @@ EAPI Eina_Bool elm_config_scroll_thumbscroll_smooth_start_get(void);
* @see elm_config_scroll_thumbscroll_smooth_start_get()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enable);
@@ -627,7 +627,7 @@ EAPI void elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enabl
* @see elm_config_scroll_animation_disable_set()
*
* @since 1.18
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI Eina_Bool elm_config_scroll_animation_disable_get(void);
@@ -642,7 +642,7 @@ EAPI Eina_Bool elm_config_scroll_animation_disable_get(void);
* @see elm_config_scroll_animation_disable_get()
*
* @since 1.18
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_animation_disable_set(Eina_Bool enable);
@@ -654,7 +654,7 @@ EAPI void elm_config_scroll_animation_disable_set(Eina_Bool enable);
* @see elm_config_scroll_accel_factor_set()
*
* @since 1.18
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_accel_factor_get(void);
@@ -671,7 +671,7 @@ EAPI double elm_config_scroll_accel_factor_get(void);
* @note Set 0.0 to disable acceleration
*
* @since 1.18
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_accel_factor_set(double factor);
@@ -683,7 +683,7 @@ EAPI void elm_config_scroll_accel_factor_set(double factor);
* @see elm_config_scroll_thumbscroll_smooth_amount_set()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_smooth_amount_get(void);
@@ -699,7 +699,7 @@ EAPI double elm_config_scroll_thumbscroll_smooth_amount_get(void);
* @see elm_config_thumbscroll_acceleration_threshold_set()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_smooth_amount_set(double amount);
@@ -711,7 +711,7 @@ EAPI void elm_config_scroll_thumbscroll_smooth_amount_set(double amount)
* @see elm_config_scroll_thumbscroll_smooth_time_window_set()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_smooth_time_window_get(void);
@@ -727,7 +727,7 @@ EAPI double elm_config_scroll_thumbscroll_smooth_time_window_get(void);
* @see elm_config_scroll_thumbscroll_smooth_time_window_get()
*
* @since 1.16
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_smooth_time_window_set(double amount);
@@ -738,7 +738,7 @@ EAPI void elm_config_scroll_thumbscroll_smooth_time_window_set(double am
*
* @return the thumb scroll acceleration threshold
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_acceleration_threshold_get(void);
@@ -750,7 +750,7 @@ EAPI double elm_config_scroll_thumbscroll_acceleration_threshold_get(void)
* @param threshold the thumb scroll acceleration threshold
*
* @see elm_config_thumbscroll_acceleration_threshold_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_acceleration_threshold_set(double threshold);
@@ -759,7 +759,7 @@ EAPI void elm_config_scroll_thumbscroll_acceleration_threshold_set(doubl
*
* @return the thumb scroll acceleration time limit
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_acceleration_time_limit_get(void);
@@ -769,7 +769,7 @@ EAPI double elm_config_scroll_thumbscroll_acceleration_time_limit_get(void
* @param time_limit the thumb scroll acceleration time limit
*
* @see elm_config_thumbscroll_acceleration_time_limit_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_acceleration_time_limit_set(double time_limit);
@@ -778,7 +778,7 @@ EAPI void elm_config_scroll_thumbscroll_acceleration_time_limit_set(doub
*
* @return the thumb scroll acceleration weight
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI double elm_config_scroll_thumbscroll_acceleration_weight_get(void);
@@ -788,7 +788,7 @@ EAPI double elm_config_scroll_thumbscroll_acceleration_weight_get(void);
* @param weight the thumb scroll acceleration weight
*
* @see elm_config_thumbscroll_acceleration_weight_get()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EAPI void elm_config_scroll_thumbscroll_acceleration_weight_set(double weight);
@@ -796,7 +796,7 @@ EAPI void elm_config_scroll_thumbscroll_acceleration_weight_set(double w
* Focus Autoscroll Mode
*
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
typedef enum
{
@@ -813,7 +813,7 @@ typedef enum
* viewport.
*
* @see elm_config_focus_autoscroll_mode_set()
- * @ingroup Focus
+ * @ingroup Elm_Focus
* @since 1.10
*/
EAPI Elm_Focus_Autoscroll_Mode elm_config_focus_autoscroll_mode_get(void);
@@ -831,7 +831,7 @@ EAPI Elm_Focus_Autoscroll_Mode elm_config_focus_autoscroll_mode_get(void);
* default historically.
*
* @see elm_config_focus_autoscroll_mode_get()
- * @ingroup Focus
+ * @ingroup Elm_Focus
* @since 1.10
*/
EAPI void elm_config_focus_autoscroll_mode_set(Elm_Focus_Autoscroll_Mode mode);
@@ -843,7 +843,7 @@ EAPI void elm_config_focus_autoscroll_mode_set(Elm_Focus_Autoscroll_Mode
* @param mode Elm_Slider_Indicator_Visible_Mode.
* viewport.
*
- * @ingroup Slider
+ * @ingroup Elm_Slider
* @since 1.13
*/
EAPI void elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visible_Mode mode);
@@ -856,7 +856,7 @@ EAPI void elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visi
* @c ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS,
* ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE if any of the above is set by user.
*
- * @ingroup Slider
+ * @ingroup Elm_Slider
* @since 1.13
*/
EAPI Elm_Slider_Indicator_Visible_Mode elm_config_slider_indicator_visible_mode_get(void);
@@ -935,7 +935,7 @@ EAPI void elm_config_tooltip_delay_set(double delay);
* This gets the globally configured exclusive usage of engine cursors.
*
* @return 1 if only engine cursors should be used
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI Eina_Bool elm_config_cursor_engine_only_get(void);
@@ -947,7 +947,7 @@ EAPI Eina_Bool elm_config_cursor_engine_only_get(void);
*
* @param engine_only If 1 only engine cursors will be enabled, if 0 will
* look for them on theme before.
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI void elm_config_cursor_engine_only_set(Eina_Bool engine_only);
@@ -958,7 +958,7 @@ EAPI void elm_config_cursor_engine_only_set(Eina_Bool engine_only);
* objects.
*
* @return The scaling factor
- * @ingroup Scaling
+ * @ingroup Elm_Scaling
*/
EAPI double elm_config_scale_get(void);
@@ -969,12 +969,12 @@ EAPI double elm_config_scale_get(void);
* objects.
*
* @param scale The scaling factor to set
- * @ingroup Scaling
+ * @ingroup Elm_Scaling
*/
EAPI void elm_config_scale_set(double scale);
/**
- * @defgroup Password_last_show Password show last
+ * @defgroup Elm_Password_last_show Password show last
* @ingroup Elementary
*
* Show last feature of password mode enables user to view
@@ -995,7 +995,7 @@ EAPI void elm_config_scale_set(double scale);
* @return @c EINA_TRUE, if the "show last" setting is enabled,
* @c EINA_FALSE if it's disabled.
*
- * @ingroup Password_last_show
+ * @ingroup Elm_Password_last_show
*/
EAPI Eina_Bool elm_config_password_show_last_get(void);
@@ -1006,7 +1006,7 @@ EAPI Eina_Bool elm_config_password_show_last_get(void);
*
* @param password_show_last If @c EINA_TRUE, enables "show last" in password mode.
* @see elm_config_password_show_last_timeout_set()
- * @ingroup Password_last_show
+ * @ingroup Elm_Password_last_show
*/
EAPI void elm_config_password_show_last_set(Eina_Bool password_show_last);
@@ -1017,7 +1017,7 @@ EAPI void elm_config_password_show_last_set(Eina_Bool password_show_last);
* mode will be visible.
*
* @return The timeout value of "show last" password mode.
- * @ingroup Password_last_show
+ * @ingroup Elm_Password_last_show
*/
EAPI double elm_config_password_show_last_timeout_get(void);
@@ -1029,7 +1029,7 @@ EAPI double elm_config_password_show_last_timeout_get(void);
*
* @param password_show_last_timeout The timeout value.
* @see elm_config_password_show_last_set()
- * @ingroup Password_last_show
+ * @ingroup Elm_Password_last_show
*/
EAPI void elm_config_password_show_last_timeout_set(double password_show_last_timeout);
@@ -1038,7 +1038,7 @@ EAPI void elm_config_password_show_last_timeout_set(double password_show_la
*/
/**
- * @defgroup Engine Elementary Engine
+ * @defgroup Elm_Engine Elementary Engine
* @ingroup Elementary
*
* These are functions setting and querying which rendering engine
@@ -1195,7 +1195,7 @@ typedef struct _Elm_Font_Overlay
* Get Elementary's list of supported text classes.
*
* @return The text classes list, with @c Elm_Text_Class blobs as data.
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* Release the list with elm_text_classes_list_free().
*/
@@ -1204,7 +1204,7 @@ EAPI Eina_List *elm_config_text_classes_list_get(void);
/**
* Free Elementary's list of supported text classes.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* @see elm_config_text_classes_list_get().
*/
@@ -1217,7 +1217,7 @@ EAPI void elm_config_text_classes_list_free(Eina_List *list);
* @return The font overlays list, with @c Elm_Font_Overlay blobs as
* data.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* For each text class, one can set a <b>font overlay</b> for it,
* overriding the default font properties for that class coming from
@@ -1236,7 +1236,7 @@ EAPI const Eina_List *elm_config_font_overlay_list_get(void);
*
* @note If the @p size is lower than zero, the value will be the amount of the size percentage. ex) -50: half of the current size, -100: current size, -10: 1/10 size.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* @p font has to be in the format returned by elm_font_fontconfig_name_get().
* @see elm_config_font_overlay_list_get()
@@ -1307,7 +1307,7 @@ EAPI void elm_config_selection_unfocused_clear_set(Eina_Bool enabled
*
* @param text_class Text class name
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* This will bring back text elements belonging to text class
* @p text_class back to their default font settings.
@@ -1318,7 +1318,7 @@ EAPI void elm_config_font_overlay_unset(const char *text_class);
* Apply the changes made with elm_config_font_overlay_set() and
* elm_config_font_overlay_unset() on the current Elementary window.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* This applies all font overlays set to all objects in the UI.
*/
@@ -1330,7 +1330,7 @@ EAPI void elm_config_font_overlay_apply(void);
* EVAS_FONT_HINTING_AUTO < Automatic font hinting
* EVAS_FONT_HINTING_BYTECODE < Bytecode font hinting
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* This applies font hint changes to all windows of the current application.
*
@@ -1345,7 +1345,7 @@ EAPI void elm_config_font_hint_type_set(int type);
*
* This gets the globally configured finger size, <b>in pixels</b>
*
- * @ingroup Fingers
+ * @ingroup Elm_Fingers
*/
EAPI Evas_Coord elm_config_finger_size_get(void);
@@ -1355,7 +1355,7 @@ EAPI Evas_Coord elm_config_finger_size_get(void);
* This sets the globally configured finger size in pixels
*
* @param size The finger size
- * @ingroup Fingers
+ * @ingroup Elm_Fingers
*/
EAPI void elm_config_finger_size_set(Evas_Coord size);
@@ -1366,7 +1366,7 @@ EAPI void elm_config_finger_size_set(Evas_Coord size);
* ticks
*
* @return The cache flush interval time
- * @ingroup Caches
+ * @ingroup Elm_Caches
*
* @see elm_cache_all_flush()
*/
@@ -1382,7 +1382,7 @@ EAPI int elm_config_cache_flush_interval_get(void);
* @note The @p size must be greater than 0. if not, the cache flush will be
* ignored.
*
- * @ingroup Caches
+ * @ingroup Elm_Caches
*
* @see elm_cache_all_flush()
*/
@@ -1400,7 +1400,7 @@ EAPI void elm_config_cache_flush_interval_set(int size);
* not rendering or doing anything graphically right now.
*
* @return The cache flush state
- * @ingroup Caches
+ * @ingroup Elm_Caches
*
* @see elm_cache_all_flush()
*/
@@ -1412,7 +1412,7 @@ EAPI Eina_Bool elm_config_cache_flush_enabled_get(void);
* This sets the globally configured cache flush enabled state.
*
* @param enabled The cache flush enabled state
- * @ingroup Caches
+ * @ingroup Elm_Caches
*
* @see elm_cache_all_flush()
*/
@@ -1424,7 +1424,7 @@ EAPI void elm_config_cache_flush_enabled_set(Eina_Bool enabled);
* This gets the globally configured font cache size, in kilo bytes.
*
* @return The font cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI int elm_config_cache_font_cache_size_get(void);
@@ -1434,7 +1434,7 @@ EAPI int elm_config_cache_font_cache_size_get(void);
* This sets the globally configured font cache size, in kilo bytes
*
* @param size The font cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI void elm_config_cache_font_cache_size_set(int size);
@@ -1444,7 +1444,7 @@ EAPI void elm_config_cache_font_cache_size_set(int size);
* This gets the globally configured image cache size, in kilo bytes
*
* @return The image cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI int elm_config_cache_image_cache_size_get(void);
@@ -1454,7 +1454,7 @@ EAPI int elm_config_cache_image_cache_size_get(void);
* This sets the globally configured image cache size, in kilo bytes
*
* @param size The image cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI void elm_config_cache_image_cache_size_set(int size);
@@ -1465,7 +1465,7 @@ EAPI void elm_config_cache_image_cache_size_set(int size);
* of files.
*
* @return The edje file cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI int elm_config_cache_edje_file_cache_size_get(void);
@@ -1476,7 +1476,7 @@ EAPI int elm_config_cache_edje_file_cache_size_get(void);
* of files.
*
* @param size The edje file cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI void elm_config_cache_edje_file_cache_size_set(int size);
@@ -1487,7 +1487,7 @@ EAPI void elm_config_cache_edje_file_cache_size_set(int size);
* number of collections.
*
* @return The edje collections cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI int elm_config_cache_edje_collection_cache_size_get(void);
@@ -1498,7 +1498,7 @@ EAPI int elm_config_cache_edje_collection_cache_size_get(void);
* number of collections.
*
* @param size The edje collections cache size
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EAPI void elm_config_cache_edje_collection_cache_size_set(int size);
@@ -1565,7 +1565,7 @@ EAPI void elm_config_accel_preference_override_set(Eina_Bool enabled);
* otherwise.
*
* @see elm_config_focus_highlight_enabled_set()
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_config_focus_highlight_enabled_get(void);
@@ -1580,7 +1580,7 @@ EAPI Eina_Bool elm_config_focus_highlight_enabled_get(void);
* this is called.
*
* @see elm_config_focus_highlight_enabled_get()
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_focus_highlight_enabled_set(Eina_Bool enable);
@@ -1594,7 +1594,7 @@ EAPI void elm_config_focus_highlight_enabled_set(Eina_Bool enabl
* one object to the next
*
* @see elm_config_focus_highlight_animate_set()
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_config_focus_highlight_animate_get(void);
@@ -1610,7 +1610,7 @@ EAPI Eina_Bool elm_config_focus_highlight_animate_get(void);
* this is called.
*
* @see elm_config_focus_highlight_animate_get()
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_focus_highlight_animate_set(Eina_Bool animate);
@@ -1625,7 +1625,7 @@ EAPI void elm_config_focus_highlight_animate_set(Eina_Bool anima
*
* @see elm_config_focus_highlight_clip_disabled_set()
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_config_focus_highlight_clip_disabled_get(void);
@@ -1637,7 +1637,7 @@ EAPI Eina_Bool elm_config_focus_highlight_clip_disabled_get(void);
*
* @see elm_config_focus_highlight_clip_disabled_get()
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_focus_highlight_clip_disabled_set(Eina_Bool disable);
@@ -1653,7 +1653,7 @@ EAPI void elm_config_focus_highlight_clip_disabled_set(Eina_Bool disable);
*
* @see elm_config_focus_move_policy_set()
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Elm_Focus_Move_Policy elm_config_focus_move_policy_get(void);
@@ -1664,7 +1664,7 @@ EAPI Elm_Focus_Move_Policy elm_config_focus_move_policy_get(void);
*
* @see elm_config_focus_move_policy_get()
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_focus_move_policy_set(Elm_Focus_Move_Policy policy);
@@ -1675,7 +1675,7 @@ EAPI void elm_config_focus_move_policy_set(Elm_Focus_Move_Policy policy);
*
* @see elm_config_item_select_on_focus_disabled_set
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_config_item_select_on_focus_disabled_get(void);
@@ -1686,7 +1686,7 @@ EAPI Eina_Bool elm_config_item_select_on_focus_disabled_get(void);
*
* @see elm_config_item_select_on_focus_disabled_get
* @since 1.10
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_item_select_on_focus_disabled_set(Eina_Bool disabled);
@@ -1697,7 +1697,7 @@ EAPI void elm_config_item_select_on_focus_disabled_set(Eina_Bool disabled);
*
* @see elm_config_first_item_focus_on_first_focusin_set
* @since 1.11
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_config_first_item_focus_on_first_focusin_get(void);
@@ -1708,7 +1708,7 @@ EAPI Eina_Bool elm_config_first_item_focus_on_first_focusin_get(void);
*
* @see elm_config_first_item_focus_on_first_focusin_get
* @since 1.11
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_config_first_item_focus_on_first_focusin_set(Eina_Bool enabled);
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 35b335e..7021c5c 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -982,8 +982,7 @@ EAPI Evas_Object *
elm_conformant_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_conform.h b/src/lib/elm_conform.h
index e61c9f1..d059e12 100644
--- a/src/lib/elm_conform.h
+++ b/src/lib/elm_conform.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Conformant Conformant
+ * @defgroup Elm_Conformant Conformant
* @ingroup Elementary
*
* @image html conformant_inheritance_tree.png
@@ -46,7 +46,7 @@
*/
/**
- * @addtogroup Conformant
+ * @addtogroup Elm_Conformant
* @{
*/
diff --git a/src/lib/elm_conform_eo.h b/src/lib/elm_conform_eo.h
index 93ee47a..e711842 100644
--- a/src/lib/elm_conform_eo.h
+++ b/src/lib/elm_conform_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Conformant
+ * @ingroup Elm_Conformant
*
* @{
*/
diff --git a/src/lib/elm_conform_legacy.h b/src/lib/elm_conform_legacy.h
index e47991a..a73ca52 100644
--- a/src/lib/elm_conform_legacy.h
+++ b/src/lib/elm_conform_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new conformant widget on the canvas.
*
- * @ingroup Conformant
+ * @ingroup Elm_Conformant
*/
EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
diff --git a/src/lib/elm_cursor.h b/src/lib/elm_cursor.h
index d5f7d24..a7495c4 100644
--- a/src/lib/elm_cursor.h
+++ b/src/lib/elm_cursor.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Cursors Cursors
+ * @defgroup Elm_Cursors Cursors
* @ingroup Elementary
*
* The Elementary cursor is an internal smart object used to
@@ -37,7 +37,7 @@
* @param obj the object being set a cursor.
* @param cursor the cursor name to be used.
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor);
@@ -47,7 +47,7 @@ EAPI void elm_object_cursor_set(Evas_Object *obj, const char *cursor);
* @param obj an object with cursor already set.
* @return the cursor name.
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI const char *elm_object_cursor_get(const Evas_Object *obj);
@@ -60,7 +60,7 @@ EAPI const char *elm_object_cursor_get(const Evas_Object *obj);
* @param obj Target object
* @see elm_object_cursor_set()
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI void elm_object_cursor_unset(Evas_Object *obj);
@@ -73,7 +73,7 @@ EAPI void elm_object_cursor_unset(Evas_Object *obj);
* @param obj an object with cursor already set.
* @param style the theme style to use (default, transparent, ...)
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI void elm_object_cursor_style_set(Evas_Object *obj, const char *style);
@@ -84,7 +84,7 @@ EAPI void elm_object_cursor_style_set(Evas_Object *obj, const char *style
* @return style the theme style in use, defaults to "default". If the
* object does not have a cursor set, then NULL is returned.
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI const char *elm_object_cursor_style_get(const Evas_Object *obj);
@@ -100,7 +100,7 @@ EAPI const char *elm_object_cursor_style_get(const Evas_Object *obj);
* @param theme_search boolean to define if cursors should be searched
* on widget's theme.
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI void elm_object_cursor_theme_search_enabled_set(Evas_Object *obj, Eina_Bool theme_search);
@@ -111,7 +111,7 @@ EAPI void elm_object_cursor_theme_search_enabled_set(Evas_Object *obj, Eina_Bool
* @return @c EINA_TRUE if the cursor set should be searched on widget's theme,
* @c EINA_FALSE otherwise.
*
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
EAPI Eina_Bool elm_object_cursor_theme_search_enabled_get(const Evas_Object *obj);
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index 26edc0c..88fe79d 100644
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -884,8 +884,7 @@ EAPI Evas_Object *
elm_datetime_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_datetime.h b/src/lib/elm_datetime.h
index cf4bc3e..48c7ac4 100644
--- a/src/lib/elm_datetime.h
+++ b/src/lib/elm_datetime.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Datetime Datetime
+ * @defgroup Elm_Datetime Datetime
* @ingroup Elementary
*
* @image html datetime_inheritance_tree.png
@@ -192,7 +192,7 @@
*/
/**
- * @addtogroup Datetime
+ * @addtogroup Elm_Datetime
* @{
*/
diff --git a/src/lib/elm_datetime_common.h b/src/lib/elm_datetime_common.h
index a2bd98d..af246c8 100644
--- a/src/lib/elm_datetime_common.h
+++ b/src/lib/elm_datetime_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Datetime
+ * @addtogroup Elm_Datetime
*
* @{
*/
diff --git a/src/lib/elm_datetime_legacy.h b/src/lib/elm_datetime_legacy.h
index 9fb9eb9..7cf1397 100644
--- a/src/lib/elm_datetime_legacy.h
+++ b/src/lib/elm_datetime_legacy.h
@@ -8,7 +8,7 @@
*
* This function inserts a new datetime widget on the canvas.
*
- * @ingroup Datetime
+ * @ingroup Elm_Datetime
*/
EAPI Evas_Object *elm_datetime_add(Evas_Object *parent);
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index 999f333..3f1b209 100644
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -249,8 +249,7 @@ _elm_dayselector_elm_container_content_set(Eo *obj, Elm_Dayselector_Data *sd, co
}
else
{
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_DAYSELECTOR_ITEM_CLASS, obj);
+ Eo *eo_it = eo_add(ELM_DAYSELECTOR_ITEM_CLASS, obj);
it = eo_data_scope_get(eo_it, ELM_DAYSELECTOR_ITEM_CLASS);
it->day = day;
@@ -453,8 +452,7 @@ EAPI Evas_Object *
elm_dayselector_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_dayselector.h b/src/lib/elm_dayselector.h
index feb5cf5..75371fb 100644
--- a/src/lib/elm_dayselector.h
+++ b/src/lib/elm_dayselector.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Dayselector Dayselector
+ * @defgroup Elm_Dayselector Dayselector
* @ingroup Elementary
*
* @image html dayselector_inheritance_tree.png
@@ -71,7 +71,7 @@
*/
/**
- * @addtogroup Dayselector
+ * @addtogroup Elm_Dayselector
* @{
*/
diff --git a/src/lib/elm_dayselector_legacy.h b/src/lib/elm_dayselector_legacy.h
index 68bc78b..b30e574 100644
--- a/src/lib/elm_dayselector_legacy.h
+++ b/src/lib/elm_dayselector_legacy.h
@@ -4,7 +4,7 @@
* @param parent Parent object
* @return New dayselector object or @c NULL, if it cannot be created
*
- * @ingroup Dayselector
+ * @ingroup Elm_Dayselector
*/
EAPI Evas_Object *elm_dayselector_add(Evas_Object *parent);
diff --git a/src/lib/elm_debug.h b/src/lib/elm_debug.h
index f5de943..1eb2136 100644
--- a/src/lib/elm_debug.h
+++ b/src/lib/elm_debug.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Debug Debug
+ * @defgroup Elm_Debug Debug
* @ingroup Elementary
* Don't use it unless you are sure.
*
@@ -10,7 +10,7 @@
* Print Tree object hierarchy in stdout
*
* @param top The root object
- * @ingroup Debug
+ * @ingroup Elm_Debug
*/
EAPI void elm_object_tree_dump(const Evas_Object *top);
@@ -19,7 +19,7 @@ EAPI void elm_object_tree_dump(const Evas_Object *top);
*
* @param top The root object
* @param file The path of output file
- * @ingroup Debug
+ * @ingroup Elm_Debug
*/
EAPI void elm_object_tree_dot_dump(const Evas_Object *top, const char *file);
diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 2ad95a9..91c556c 100644
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -470,7 +470,7 @@ EINA_DEPRECATED EAPI Elm_Notify_Orient elm_notify_orient_get(const Ev
*
* @deprecated see elm_label_slide_mode_set() instead.
*
- * @ingroup Label
+ * @ingroup Elm_Label
*/
EINA_DEPRECATED EAPI void elm_label_slide_set(Evas_Object *obj, Eina_Bool slide);
@@ -484,7 +484,7 @@ EINA_DEPRECATED EAPI void elm_label_slide_set(Evas_Object
*
* @deprecated see elm_label_slide_mode_get() instead.
*
- * @ingroup Label
+ * @ingroup Elm_Label
*/
EINA_DEPRECATED EAPI Eina_Bool elm_label_slide_get(const Evas_Object *obj);
@@ -511,7 +511,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_label_slide_get(const Evas_
*
* @deprecated Use elm_object_domain_translatable_part_text_set() instead.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EINA_DEPRECATED EAPI void elm_object_domain_translatable_text_part_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
@@ -529,7 +529,7 @@ EINA_DEPRECATED EAPI void elm_object_domain_translatable_text_part_set(Evas
*
* @deprecated Use elm_object_translatable_part_text_get() instead.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EINA_DEPRECATED EAPI const char *elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part);
@@ -548,7 +548,7 @@ EINA_DEPRECATED EAPI const char *elm_object_translatable_text_part_get(const Eva
* @see also elm_naviframe_item_title_visible_get()
* @see also elm_naviframe_item_title_enabled_get()
*
- * @ingroup Naviframe
+ * @ingroup Elm_Naviframe
*/
EINA_DEPRECATED EAPI void elm_naviframe_item_title_visible_set(Elm_Object_Item *it, Eina_Bool visible);
@@ -562,7 +562,7 @@ EINA_DEPRECATED EAPI void elm_naviframe_item_title_visible_set(Elm_Object_I
*
* @see also elm_naviframe_item_title_visible_set()
*
- * @ingroup Naviframe
+ * @ingroup Elm_Naviframe
*/
EINA_DEPRECATED EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Object_Item *it);
@@ -583,7 +583,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_naviframe_item_title_visible_get(const Elm_Ob
* @see elm_scroller_bounce_set()
* @see elm_genlist_bounce_get()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -601,7 +601,7 @@ EINA_DEPRECATED EAPI void elm_genlist_bounce_set(Evas_Object *obj, Eina
* @see elm_scroller_bounce_get()
* @see elm_genlist_bounce_set()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -623,7 +623,7 @@ EINA_DEPRECATED EAPI void elm_genlist_bounce_get(const Evas_Object *obj
*
* @see elm_scroller_policy_set()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -638,7 +638,7 @@ EINA_DEPRECATED EAPI void elm_genlist_scroller_policy_set(Evas_Object *
*
* @see elm_scroller_policy_get()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
@@ -656,7 +656,7 @@ EINA_DEPRECATED EAPI void elm_genlist_scroller_policy_get(const Evas_Ob
*
* @deprecated Use elm_scroller_policy_set() instead.
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EINA_DEPRECATED EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
@@ -672,7 +672,7 @@ EINA_DEPRECATED EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_S
*
* @deprecated Use elm_scroller_bounce_set() instead.
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EINA_DEPRECATED EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -685,7 +685,7 @@ EINA_DEPRECATED EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bou
*
* @deprecated Use elm_scroller_bounce_get() instead.
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EINA_DEPRECATED EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -698,7 +698,7 @@ EINA_DEPRECATED EAPI void elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool
*
* @deprecated Use elm_scroller_bounce_set() instead.
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*/
EINA_DEPRECATED EAPI void elm_photocam_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -713,7 +713,7 @@ EINA_DEPRECATED EAPI void elm_photocam_bounce_set(Evas_Object *obj, Eina_Bool
*
* @deprecated Use elm_scroller_bounce_get() instead.
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*/
EINA_DEPRECATED EAPI void elm_photocam_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -731,7 +731,7 @@ EINA_DEPRECATED EAPI void elm_photocam_bounce_get(const Evas_Object *obj, Eina
*
* @see elm_scroller_bounce_set()
*
- * @ingroup List
+ * @ingroup Elm_List
*/
EINA_DEPRECATED EAPI void elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -752,7 +752,7 @@ EINA_DEPRECATED EAPI void elm_list_bounce_set(Evas_Object *obj, Eina_Boo
* @see elm_scroller_bounce_get()
* @see elm_list_bounce_set()
*
- * @ingroup List
+ * @ingroup Elm_List
*/
EINA_DEPRECATED EAPI void elm_list_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -775,7 +775,7 @@ EINA_DEPRECATED EAPI void elm_list_bounce_get(const Evas_Object *obj, Ei
*
* @deprecated Use elm_scroller_policy_set() instead.
*
- * @ingroup List
+ * @ingroup Elm_List
*/
EINA_DEPRECATED EAPI void elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -790,7 +790,7 @@ EINA_DEPRECATED EAPI void elm_list_scroller_policy_set(Evas_Object *obj,
*
* @deprecated Use elm_scroller_policy_get() instead.
*
- * @ingroup List
+ * @ingroup Elm_List
*/
EINA_DEPRECATED EAPI void elm_list_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
@@ -803,7 +803,7 @@ EINA_DEPRECATED EAPI void elm_list_scroller_policy_get(const Evas_Object
*
* @deprecated Use elm_layout_theme_set() instead.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EINA_DEPRECATED EAPI void elm_scroller_custom_widget_base_theme_set(Evas_Object *obj, const char *widget, const char *base);
@@ -821,7 +821,7 @@ EINA_DEPRECATED EAPI void elm_scroller_custom_widget_base_theme_set(Evas
*
* @see elm_scroller_bounce_set()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -842,7 +842,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_bounce_set(Evas_Object *obj, Eina_Boo
* @see elm_scroller_bounce_get()
* @see elm_diskselector_bounce_set()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -859,7 +859,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, Ei
*
* @see elm_scroller_policy_get()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
@@ -882,7 +882,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_get(const Evas_Object
*
* @see elm_scroller_policy_set()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -902,7 +902,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_set(Evas_Object *obj,
*
* @deprecated Use elm_image_file_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, const char *file, const char *group);
@@ -927,7 +927,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_file_set(Evas_Object *obj, c
*
* @deprecated Use elm_image_memfile_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key);
@@ -942,7 +942,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_memfile_set(Evas_Object *obj
*
* @deprecated Use elm_image_file_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_file_get(const Evas_Object *obj, const char **file, const char **group);
@@ -965,7 +965,7 @@ EINA_DEPRECATED EAPI void elm_icon_file_get(const Evas_Object *
*
* @deprecated Use elm_image_smooth_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_smooth_set(Evas_Object *obj, Eina_Bool smooth);
@@ -979,7 +979,7 @@ EINA_DEPRECATED EAPI void elm_icon_smooth_set(Evas_Object *obj,
*
* @deprecated Use elm_image_smooth_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_smooth_get(const Evas_Object *obj);
@@ -1001,7 +1001,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_smooth_get(const Evas_Object
*
* @deprecated Use elm_image_no_scale_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_no_scale_set(Evas_Object *obj, Eina_Bool no_scale);
@@ -1015,7 +1015,7 @@ EINA_DEPRECATED EAPI void elm_icon_no_scale_set(Evas_Object *ob
*
* @deprecated Use elm_image_no_scale_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_no_scale_get(const Evas_Object *obj);
@@ -1036,7 +1036,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_no_scale_get(const Evas_Obje
*
* @deprecated Use elm_image_resizable_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_resizable_set(Evas_Object *obj, Eina_Bool size_up, Eina_Bool size_down);
@@ -1051,7 +1051,7 @@ EINA_DEPRECATED EAPI void elm_icon_resizable_set(Evas_Object *o
*
* @deprecated Use elm_image_resizable_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_resizable_get(const Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down);
@@ -1064,7 +1064,7 @@ EINA_DEPRECATED EAPI void elm_icon_resizable_get(const Evas_Obj
*
* @deprecated Use elm_image_object_size_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_size_get(const Evas_Object *obj, int *w, int *h);
@@ -1091,7 +1091,7 @@ EINA_DEPRECATED EAPI void elm_icon_size_get(const Evas_Object *
*
* @deprecated Use elm_image_fill_outside_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
@@ -1106,7 +1106,7 @@ EINA_DEPRECATED EAPI void elm_icon_fill_outside_set(Evas_Object
*
* @deprecated Use elm_image_fill_outside_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_fill_outside_get(const Evas_Object *obj);
@@ -1132,7 +1132,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_fill_outside_get(const Evas_
*
* @deprecated Use elm_image_prescale_set() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI void elm_icon_prescale_set(Evas_Object *obj, int size);
@@ -1146,7 +1146,7 @@ EINA_DEPRECATED EAPI void elm_icon_prescale_set(Evas_Object *ob
*
* @deprecated Use elm_image_prescale_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI int elm_icon_prescale_get(const Evas_Object *obj);
@@ -1158,7 +1158,7 @@ EINA_DEPRECATED EAPI int elm_icon_prescale_get(const Evas_Obje
*
* @deprecated Use elm_image_object_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Evas_Object *elm_icon_object_get(Evas_Object *obj);
@@ -1167,7 +1167,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_icon_object_get(Evas_Object *obj)
*
* @param obj The icon object
* @param disabled If EINA_TRUE, preloading will be disabled
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_preload_disabled_set() instead.
*
@@ -1184,7 +1184,7 @@ EINA_DEPRECATED EAPI void elm_icon_preload_disabled_set(Evas_Object *obj, Eina_
* Return if this elm icon's image can be animated. Currently Evas only
* supports gif animation. If the return value is EINA_FALSE, other
* elm_icon_animated_xxx APIs won't work.
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_animated_available_get() instead.
*
@@ -1203,7 +1203,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_animated_available_get(const Evas_Object
* can animate, and this is supported if you enable animated support
* on the icon.
* Set it to EINA_TRUE when the icon needs to be animated.
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_animated_set() instead.
*
@@ -1216,7 +1216,7 @@ EINA_DEPRECATED EAPI void elm_icon_animated_set(Evas_Object *obj, Eina_Bool ani
* @param obj The icon object
* @return The animation mode of the icon object
* @see elm_icon_animated_set
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_animated_get() instead.
*
@@ -1241,7 +1241,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_animated_get(const Evas_Object *obj);
* 2. Check play flag using elm_icon_animated_play_get
* 3. If elm icon was playing, set play to EINA_FALSE.
* Then animation will be stopped and vice versa
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_animated_play_set() instead.
*
@@ -1255,7 +1255,7 @@ EINA_DEPRECATED EAPI void elm_icon_animated_play_set(Evas_Object *obj, Eina_Boo
* @return The play mode of the icon object
*
* @see elm_icon_animated_play_get
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_animated_play_get() instead.
*
@@ -1277,7 +1277,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_animated_play_get(const Evas_Object *obj
* @see elm_icon_aspect_fixed_get()
* @see elm_icon_fill_outside_set()
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*
* @deprecated Use elm_image_aspect_fixed_set() instead.
*
@@ -1293,7 +1293,7 @@ EINA_DEPRECATED EAPI void elm_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool
*
* @deprecated Use elm_image_aspect_fixed_get() instead.
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EINA_DEPRECATED EAPI Eina_Bool elm_icon_aspect_fixed_get(const Evas_Object *obj);
@@ -1313,7 +1313,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_icon_aspect_fixed_get(const Evas_Object *obj)
*
* @deprecated Use elm_fileselector_path_set() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI void elm_fileselector_button_path_set(Evas_Object *obj, const char *path);
@@ -1328,7 +1328,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_button_path_set(Evas_Object *o
*
* @deprecated Use elm_fileselector_path_get() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI const char *elm_fileselector_button_path_get(const Evas_Object *obj);
@@ -1352,7 +1352,7 @@ EINA_DEPRECATED EAPI const char *elm_fileselector_button_path_get(const Evas_Obj
*
* @deprecated Use elm_fileselector_expandable_set() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI void elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
@@ -1368,7 +1368,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_button_expandable_set(Evas_Obj
*
* @deprecated Use elm_fileselector_expandable_get() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_expandable_get(const Evas_Object *obj);
@@ -1390,7 +1390,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_expandable_get(const Ev
*
* @deprecated Use elm_fileselector_folder_only_set() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI void elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
@@ -1408,7 +1408,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_button_folder_only_set(Evas_Ob
*
* @deprecated Use elm_fileselector_folder_only_get() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_folder_only_get(const Evas_Object *obj);
@@ -1429,7 +1429,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_folder_only_get(const E
*
* @deprecated Use elm_fileselector_is_save_set() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI void elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
@@ -1446,7 +1446,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_button_is_save_set(Evas_Object
*
* @deprecated Use elm_fileselector_is_save_get() instead.
*
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_is_save_get(const Evas_Object *obj);
@@ -1466,7 +1466,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_button_is_save_get(const Evas_
*
* @deprecated Use elm_fileselector_path_set() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI void elm_fileselector_entry_path_set(Evas_Object *obj, const char *path);
@@ -1480,7 +1480,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_entry_path_set(Evas_Object *ob
* @see elm_fileselector_path_set() for more details
*
* @deprecated Use elm_fileselector_path_get() instead.
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI const char *elm_fileselector_entry_path_get(const Evas_Object *obj);
@@ -1503,7 +1503,7 @@ EINA_DEPRECATED EAPI const char *elm_fileselector_entry_path_get(const Evas_Obje
*
* @deprecated Use elm_fileselector_expandable_set() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI void elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
@@ -1519,7 +1519,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_entry_expandable_set(Evas_Obje
*
* @deprecated Use elm_fileselector_expandable_get() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_expandable_get(const Evas_Object *obj);
@@ -1541,7 +1541,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_expandable_get(const Eva
*
* @deprecated Use elm_fileselector_folder_only_set() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI void elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
@@ -1559,7 +1559,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_entry_folder_only_set(Evas_Obj
*
* @deprecated Use elm_fileselector_folder_only_get() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_folder_only_get(const Evas_Object *obj);
@@ -1580,7 +1580,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_folder_only_get(const Ev
*
* @deprecated Use elm_fileselector_is_save_set() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI void elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
@@ -1597,7 +1597,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_entry_is_save_set(Evas_Object
*
* @deprecated Use elm_fileselector_is_save_get() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_is_save_get(const Evas_Object *obj);
@@ -1617,7 +1617,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_fileselector_entry_is_save_get(const Evas_O
*
* @deprecated Use elm_fileselector_selected_set() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI void elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
@@ -1633,7 +1633,7 @@ EINA_DEPRECATED EAPI void elm_fileselector_entry_selected_set(Evas_Object
*
* @deprecated Use elm_fileselector_selected_get() instead.
*
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
*/
EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_get(const Evas_Object *obj);
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 8ce0672..249a26e 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -665,8 +665,7 @@ _item_new(Evas_Object *obj,
Evas_Smart_Cb func,
const void *data)
{
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_DISKSELECTOR_ITEM_CLASS, obj);
+ Eo *eo_it = eo_add(ELM_DISKSELECTOR_ITEM_CLASS, obj);
if (!eo_it) return NULL;
ELM_DISKSELECTOR_ITEM_DATA_GET(eo_it, it);
@@ -1456,8 +1455,7 @@ EAPI Evas_Object *
elm_diskselector_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_diskselector.h b/src/lib/elm_diskselector.h
index 3f0a431..8ed6904 100644
--- a/src/lib/elm_diskselector.h
+++ b/src/lib/elm_diskselector.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Diskselector Diskselector
+ * @defgroup Elm_Diskselector Diskselector
* @ingroup Elementary
*
* @image html diskselector_inheritance_tree.png
@@ -62,7 +62,7 @@
*/
/**
- * @addtogroup Diskselector
+ * @addtogroup Elm_Diskselector
* @{
*/
diff --git a/src/lib/elm_diskselector_legacy.h b/src/lib/elm_diskselector_legacy.h
index 5213ad5..7ee5080 100644
--- a/src/lib/elm_diskselector_legacy.h
+++ b/src/lib/elm_diskselector_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new diskselector widget on the canvas.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EAPI Evas_Object *elm_diskselector_add(Evas_Object *parent);
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 9e6613f..81676b2 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2152,8 +2152,6 @@ _entry_selection_start_signal_cb(void *data,
{
const Eina_List *l;
Evas_Object *entry;
- const char *txt = elm_entry_selection_get(data);
- Evas_Object *top;
EINA_LIST_FOREACH(entries, l, entry)
{
@@ -2162,13 +2160,6 @@ _entry_selection_start_signal_cb(void *data,
eo_event_callback_call
(data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL);
- top = elm_widget_top_get(data);
- if (txt && top && (elm_win_window_id_get(top)))
- {
- elm_cnp_selection_set(data, ELM_SEL_TYPE_PRIMARY,
- ELM_SEL_FORMAT_MARKUP, txt, strlen(txt));
- elm_cnp_selection_loss_callback_set(data, ELM_SEL_TYPE_PRIMARY, _selection_clear, data);
- }
elm_object_focus_set(data, EINA_TRUE);
}
@@ -3872,8 +3863,7 @@ EAPI Evas_Object *
elm_entry_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -4117,7 +4107,7 @@ _elm_entry_line_wrap_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
}
EOLIAN static void
-_elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
+_elm_entry_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
{
if (sd->editable == editable) return;
sd->editable = editable;
@@ -4140,7 +4130,7 @@ _elm_entry_editable_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool editable)
}
EOLIAN static Eina_Bool
-_elm_entry_editable_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
+_elm_entry_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
{
return sd->editable;
}
@@ -5865,4 +5855,17 @@ _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
return ret ? strdup(ret) : NULL;
}
+/* Legacy deprecated functions */
+EAPI void
+elm_entry_editable_set(Evas_Object *obj, Eina_Bool edit)
+{
+ evas_draggable_interface_drag_target_set(obj, edit);
+}
+
+EAPI Eina_Bool
+elm_entry_editable_get(const Evas_Object *obj)
+{
+ return evas_draggable_interface_drag_target_get(obj);
+}
+
#include "elm_entry.eo.c"
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index 166c6c7..71825e2 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -112,7 +112,8 @@ enum Elm.Cnp_Mode
class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
Elm.Interface_Atspi_Text, Elm.Interface_Atspi_Editable_Text, Efl.File,
- Evas.Selectable_Interface, Evas.Scrollable_Interface)
+ Evas.Selectable_Interface, Evas.Scrollable_Interface,
+ Evas.Draggable_Interface)
{
eo_prefix: elm_obj_entry;
methods {
@@ -261,28 +262,6 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
autocapital_type: Elm.Autocapital.Type; [[The type of autocapitalization.]]
}
}
- @property editable {
- set {
- [[Sets if the entry is to be editable or not.
-
- By default, entries are editable and when focused, any text input by the
- user will be inserted at the current cursor position. But calling this
- function with $editable as $false will prevent the user from
- inputting text into the entry.
-
- The only way to change the text of a non-editable entry is to use
- \@ref elm_object_text_set, \@ref elm_entry_entry_insert and other related
- functions.
- ]]
- }
- get {
- [[Get whether the entry is editable or not.]]
- }
- values {
- editable: bool; [[If $true, user input will be inserted in the entry,
- if not, the entry is read-only and no user input is allowed.]]
- }
- }
@property anchor_hover_style {
set {
[[Set the style that the hover should use
@@ -925,6 +904,8 @@ class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interface,
Evas.Object_Smart.del;
Evas.Object_Smart.show;
Evas.Object_Smart.hide;
+ Evas.Draggable_Interface.drag_target.set;
+ Evas.Draggable_Interface.drag_target.get;
Elm.Widget.activate;
Elm.Widget.focus_direction_manager_is;
Elm.Widget.theme_apply;
diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h
index c4dd8bd..a24a1cb 100644
--- a/src/lib/elm_entry.h
+++ b/src/lib/elm_entry.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Entry Entry
+ * @defgroup Elm_Entry Entry
* @ingroup Elementary
*
* @image html entry_inheritance_tree.png
diff --git a/src/lib/elm_entry_common.h b/src/lib/elm_entry_common.h
index cee2383..01ececb 100644
--- a/src/lib/elm_entry_common.h
+++ b/src/lib/elm_entry_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Entry
+ * @addtogroup Elm_Entry
*
* @{
*/
diff --git a/src/lib/elm_entry_legacy.h b/src/lib/elm_entry_legacy.h
index 1482710..040fef5 100644
--- a/src/lib/elm_entry_legacy.h
+++ b/src/lib/elm_entry_legacy.h
@@ -12,7 +12,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
@@ -24,7 +24,7 @@ EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
*
* @note Using this function bypasses text filters
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
@@ -35,7 +35,7 @@ EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry)
* @param obj The entry object
* @return The currently displayed text or NULL on failure
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*/
EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
@@ -51,7 +51,7 @@ EAPI const char *elm_entry_entry_get(const Evas_Object *obj);
*
* @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*
* @param[in] file The path to the file to load and save
* @param[in] format The file format
@@ -65,9 +65,38 @@ EAPI Eina_Bool elm_entry_file_set(Evas_Object *obj, const char *file, E
* This function can be used to retrieve any file set on the entry for
* edition, along with the format used to load and save it.
*
- * @ingroup Entry
+ * @ingroup Elm_Entry
*
* @param[out] file The path to the file to load and save
* @param[out] format The file format
*/
EAPI void elm_entry_file_get(const Evas_Object *obj, const char **file, Elm_Text_Format *format);
+
+/**
+ * @brief Sets if the entry is to be editable or not.
+ *
+ * By default, entries are editable and when focused, any text input by the
+ * user will be inserted at the current cursor position. But calling this
+ * function with @c editable as @c false will prevent the user from inputting
+ * text into the entry.
+ *
+ * The only way to change the text of a non-editable entry is to use @ref
+ * elm_object_text_set, @ref elm_entry_entry_insert and other related
+ * functions.
+ *
+ * @param[in] editable If @c true, user input will be inserted in the entry, if
+ * not, the entry is read-only and no user input is allowed.
+ *
+ * @ingroup Elm_Entry
+ */
+EAPI void elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable);
+
+/**
+ * @brief Get whether the entry is editable or not.
+ *
+ * @return If @c true, user input will be inserted in the entry, if not, the
+ * entry is read-only and no user input is allowed.
+ *
+ * @ingroup Elm_Entry
+ */
+EAPI Eina_Bool elm_entry_editable_get(const Evas_Object *obj);
diff --git a/src/lib/elm_finger.h b/src/lib/elm_finger.h
index 17d3be5..0da711a 100644
--- a/src/lib/elm_finger.h
+++ b/src/lib/elm_finger.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Fingers Fingers
+ * @defgroup Elm_Fingers Fingers
* @ingroup Elementary
*
* Elementary is designed to be finger-friendly for touchscreens,
@@ -36,7 +36,7 @@
* on size evaluation times for widgets. An external user wouldn't
* be calling, most of the time.
*
- * @ingroup Fingers
+ * @ingroup Elm_Fingers
*/
EAPI void elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, Evas_Coord *h);
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index cb3ac3d..8945690 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1856,8 +1856,7 @@ EAPI Evas_Object *
elm_flip_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_flip.h b/src/lib/elm_flip.h
index 8effc46..3bdbdd8 100644
--- a/src/lib/elm_flip.h
+++ b/src/lib/elm_flip.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Flip Flip
+ * @defgroup Elm_Flip Flip
* @ingroup Elementary
*
* @image html flip_inheritance_tree.png
diff --git a/src/lib/elm_flip_legacy.h b/src/lib/elm_flip_legacy.h
index 85e09b9..23f3b78 100644
--- a/src/lib/elm_flip_legacy.h
+++ b/src/lib/elm_flip_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Flip
+ * @ingroup Elm_Flip
*/
EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
@@ -18,7 +18,7 @@ EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
*
* @warning This function currently does nothing.
*
- * @ingroup Flip
+ * @ingroup Elm_Flip
*/
EAPI void elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 58fabe8..2e789e7 100644
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -313,7 +313,7 @@ _item_new(Evas_Object *obj,
ELM_FLIPSELECTOR_DATA_GET(obj, sd);
- eo_add(&eo_item, ELM_FLIPSELECTOR_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_FLIPSELECTOR_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_FLIPSELECTOR_ITEM_DATA_GET(eo_item, it);
@@ -562,8 +562,7 @@ EAPI Evas_Object *
elm_flipselector_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_flipselector.h b/src/lib/elm_flipselector.h
index 615a5c3..ee9d765 100644
--- a/src/lib/elm_flipselector.h
+++ b/src/lib/elm_flipselector.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Flipselector Flip Selector
+ * @defgroup Elm_Flipselector Flip Selector
* @ingroup Elementary
*
* @image html flipselector_inheritance_tree.png
@@ -55,7 +55,7 @@
*/
/**
- * @addtogroup Flipselector
+ * @addtogroup Elm_Flipselector
* @{
*/
diff --git a/src/lib/elm_flipselector_legacy.h b/src/lib/elm_flipselector_legacy.h
index 556272c..a2fbd58 100644
--- a/src/lib/elm_flipselector_legacy.h
+++ b/src/lib/elm_flipselector_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new flip selector widget on the canvas.
*
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EAPI Evas_Object *elm_flipselector_add(Evas_Object *parent);
diff --git a/src/lib/elm_focus.h b/src/lib/elm_focus.h
index 1d4952d..7c114ab 100644
--- a/src/lib/elm_focus.h
+++ b/src/lib/elm_focus.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Focus Focus
+ * @defgroup Elm_Focus Focus
* @ingroup Elementary
*
* An Elementary application has, at all times, one (and only one)
@@ -42,7 +42,7 @@
*
* @see elm_object_focus_set()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj);
@@ -64,7 +64,7 @@ EAPI Eina_Bool elm_object_focus_get(const Evas_Object *obj);
*
* @see elm_object_focus_get(), elm_object_focus_custom_chain_get()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus);
@@ -82,7 +82,7 @@ EAPI void elm_object_focus_set(Evas_Object *obj, Eina_Bool focus
* will get the event, but not take away the focus from where it
* was previously.
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_allow_set(Evas_Object *obj, Eina_Bool enable);
@@ -97,7 +97,7 @@ EAPI void elm_object_focus_allow_set(Evas_Object *obj, Eina_Bool
* events are created able to be focused, by default. All the
* others are not.
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_object_focus_allow_get(const Evas_Object *obj);
@@ -112,7 +112,7 @@ EAPI Eina_Bool elm_object_focus_allow_get(const Evas_Object *obj);
*
* @param obj The container object
* @param objs Chain of objects to pass focus
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_custom_chain_set(Evas_Object *obj, Eina_List *objs);
@@ -124,7 +124,7 @@ EAPI void elm_object_focus_custom_chain_set(Evas_Object *obj, Ei
* Any focus chain previously set on @p obj (for its child objects)
* is removed entirely after this call.
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_custom_chain_unset(Evas_Object *obj);
@@ -132,7 +132,7 @@ EAPI void elm_object_focus_custom_chain_unset(Evas_Object *obj);
* Get custom focus chain
*
* @param obj The container object
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI const Eina_List *elm_object_focus_custom_chain_get(const Evas_Object *obj);
@@ -147,7 +147,7 @@ EAPI const Eina_List *elm_object_focus_custom_chain_get(const Evas_Object *o
* @param obj The container object
* @param child The child to be added in custom chain
* @param relative_child The relative object to position the child
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_custom_chain_append(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
@@ -162,7 +162,7 @@ EAPI void elm_object_focus_custom_chain_append(Evas_Object *obj,
* @param obj The container object
* @param child The child to be added in custom chain
* @param relative_child The relative object to position the child
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj, Evas_Object *child, Evas_Object *relative_child);
@@ -178,7 +178,7 @@ EAPI void elm_object_focus_custom_chain_prepend(Evas_Object *obj
*
* @see elm_object_focus_next_object_get(), elm_object_focus_next_object_set()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Direction dir);
@@ -196,7 +196,7 @@ EAPI void elm_object_focus_next(Evas_Object *obj, Elm_Focus_Dire
*
* @since 1.8
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Evas_Object * elm_object_focus_next_object_get(const Evas_Object *obj, Elm_Focus_Direction dir);
@@ -216,7 +216,7 @@ EAPI Evas_Object * elm_object_focus_next_object_get(const Evas_Object *ob
*
* @since 1.8
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir);
@@ -230,7 +230,7 @@ EAPI void elm_object_focus_next_object_set(Evas_Object *obj, Eva
*
* @since 1.8
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Evas_Object *elm_object_focused_object_get(const Evas_Object *obj);
@@ -252,7 +252,7 @@ EAPI Evas_Object *elm_object_focused_object_get(const Evas_Object *obj);
*
* @see elm_object_tree_focus_allow_get()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*
*/
EAPI void elm_object_tree_focus_allow_set(Evas_Object *obj, Eina_Bool focusable);
@@ -266,7 +266,7 @@ EAPI void elm_object_tree_focus_allow_set(Evas_Object *obj, Eina
*
* @see elm_object_tree_focus_allow_set()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_object_tree_focus_allow_get(const Evas_Object *obj);
@@ -284,7 +284,7 @@ EAPI Eina_Bool elm_object_tree_focus_allow_get(const Evas_Object *obj
*
* @since 1.9
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Eina_Bool elm_object_focus_highlight_style_set(Evas_Object *obj, const char *style);
@@ -298,7 +298,7 @@ EAPI Eina_Bool elm_object_focus_highlight_style_set(Evas_Object *obj, const c
*
* @since 1.9
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI const char *elm_object_focus_highlight_style_get(const Evas_Object *obj);
@@ -312,7 +312,7 @@ EAPI const char *elm_object_focus_highlight_style_get(const Evas_Object *obj);
*
* @since 1.15
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_move_policy_set(Evas_Object *obj, Elm_Focus_Move_Policy policy);
@@ -334,7 +334,7 @@ EAPI void elm_object_focus_move_policy_set(Evas_Object *obj, Elm
*
* @since 1.15
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Elm_Focus_Move_Policy elm_object_focus_move_policy_get(const Evas_Object *obj);
@@ -353,7 +353,7 @@ EAPI Elm_Focus_Move_Policy elm_object_focus_move_policy_get(const Evas_Object *
*
* @since 1.16
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_region_show_mode_set(Evas_Object *obj, Elm_Focus_Region_Show_Mode mode);
@@ -367,6 +367,36 @@ EAPI void elm_object_focus_region_show_mode_set(Evas_Objec
*
* @since 1.16
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Elm_Focus_Region_Show_Mode elm_object_focus_region_show_mode_get(const Evas_Object *obj);
+
+/**
+ * Returns the widget's focus movement policy mode setting.
+ *
+ * @param obj The widget.
+ * @return focus movement policy mode setting of the object.
+ *
+ * @see elm_object_focus_move_policy_automatic_set
+ *
+ * @since 1.18
+ *
+ * @ingroup Focus
+ */
+EAPI Eina_Bool elm_object_focus_move_policy_automatic_get(const Evas_Object *obj);
+
+/**
+ * Sets the widget's focus movement policy mode setting.
+ * When widget in automatic mode, it follows the system focus movement policy mode
+ * set by elm_config_focus_move_policy_set().
+ * @param obj The widget.
+ * @param automatic @c EINA_TRUE for auto focus_move_policy mode. @c EINA_FALSE for
+ * manual.
+ *
+ * @see elm_object_focus_move_policy_automatic_get
+ *
+ * @since 1.18
+ *
+ * @ingroup Focus
+ */
+EAPI void elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic);
diff --git a/src/lib/elm_focus_item.h b/src/lib/elm_focus_item.h
index b8ef680..71c068a 100644
--- a/src/lib/elm_focus_item.h
+++ b/src/lib/elm_focus_item.h
@@ -12,7 +12,7 @@
* see @elm_object_item_focus_set()
* see @elm_object_item_focus_get()
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
* @since 1.10
*/
EAPI Elm_Object_Item *elm_object_focused_item_get(const Evas_Object *obj);
@@ -32,7 +32,7 @@ EAPI Elm_Object_Item *elm_object_focused_item_get(const Evas_Object
*
* @since 1.16
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI Elm_Object_Item * elm_object_focus_next_item_get(const Evas_Object *obj, Elm_Focus_Direction dir);
@@ -54,7 +54,7 @@ EAPI Elm_Object_Item * elm_object_focus_next_item_get(const Evas_Object *obj,
*
* @since 1.16
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EAPI void elm_object_focus_next_item_set(Evas_Object *obj, Elm_Object_Item *next_item, Elm_Focus_Direction dir);
diff --git a/src/lib/elm_font.h b/src/lib/elm_font.h
index cf21df7..3213aeb 100644
--- a/src/lib/elm_font.h
+++ b/src/lib/elm_font.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Fonts Elementary Fonts
+ * @defgroup Elm_Fonts Elementary Fonts
* @ingroup Elementary
*
* These are functions dealing with font rendering, selection and the
@@ -23,7 +23,7 @@ typedef struct _Elm_Font_Properties
* @param font The font name and styles string
* @return the font properties struct
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* @note The reverse translation can be achieved with
* elm_font_fontconfig_name_get(), for one style only (single font
@@ -36,7 +36,7 @@ EAPI Elm_Font_Properties *elm_font_properties_get(const char *font);
*
* @param efp the font properties struct
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*/
EAPI void elm_font_properties_free(Elm_Font_Properties *efp);
@@ -49,7 +49,7 @@ EAPI void elm_font_properties_free(Elm_Font_Properties *efp);
*
* @return the font name and style string
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* @note The reverse translation can be achieved with
* elm_font_properties_get(), for one style only (single font
@@ -62,7 +62,7 @@ EAPI char *elm_font_fontconfig_name_get(const char *name, const char *style
*
* @param name the font properties struct
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*/
EAPI void elm_font_fontconfig_name_free(char *name);
@@ -77,7 +77,7 @@ EAPI void elm_font_fontconfig_name_free(char *name);
* evas_font_available_list().
* @return the font hash.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* @note The user is supposed to get it populated at least with 3
* default font families (Sans, Serif, Monospace), which should be
@@ -90,7 +90,7 @@ EAPI Eina_Hash *elm_font_available_hash_add(Eina_List *list);
*
* @param hash the hash to be freed.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*/
EAPI void elm_font_available_hash_del(Eina_Hash *hash);
diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index dbe7081..8b72263 100644
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -195,8 +195,7 @@ EAPI Evas_Object *
elm_frame_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_frame.h b/src/lib/elm_frame.h
index a7dad2b..5ff0e17 100644
--- a/src/lib/elm_frame.h
+++ b/src/lib/elm_frame.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Frame Frame
+ * @defgroup Elm_Frame Frame
* @ingroup Elementary
*
* @image html frame_inheritance_tree.png
diff --git a/src/lib/elm_frame_legacy.h b/src/lib/elm_frame_legacy.h
index 3462a1f..a0f51f8 100644
--- a/src/lib/elm_frame_legacy.h
+++ b/src/lib/elm_frame_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Frame
+ * @ingroup Elm_Frame
*/
EAPI Evas_Object *elm_frame_add(Evas_Object *parent);
diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h
index 473aa10..365331e 100644
--- a/src/lib/elm_general.h
+++ b/src/lib/elm_general.h
@@ -1,5 +1,5 @@
/**
- * @defgroup General General
+ * @defgroup Elm_General General
* @ingroup Elementary
*
* @brief General Elementary API. Functions that don't relate to
@@ -14,7 +14,7 @@
*/
/**
- * @addtogroup General
+ * @addtogroup Elm_General
* @{
*/
@@ -108,7 +108,7 @@ extern EAPI double _elm_startup_time;
* See the full @ref bg_example_01_c "example".
*
* @see elm_shutdown().
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI int elm_init(int argc, char **argv);
@@ -128,7 +128,7 @@ EAPI int elm_init(int argc, char **argv);
* There is a possibility to call your ecore callbacks(timer, animator, event,
* job, and etc.) in elm_shutdown()
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI int elm_shutdown(void);
@@ -146,7 +146,7 @@ EAPI int elm_shutdown(void);
*
* @see elm_init() for an example
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_run(void);
@@ -165,7 +165,7 @@ EAPI void elm_run(void);
* @note By using the appropriate #ELM_POLICY_QUIT on your Elementary
* applications, you'll be able to get this function called automatically for you.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_exit(void);
@@ -247,7 +247,7 @@ EAPI char *elm_quicklaunch_exe_path_get(const char *exe, const char *cwd);
* @note Currently, we have only one policy identifier/group
* (#ELM_POLICY_QUIT), which has two possible values.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Eina_Bool elm_policy_set(unsigned int policy, int value);
@@ -258,7 +258,7 @@ EAPI Eina_Bool elm_policy_set(unsigned int policy, int value);
* @return The currently set policy value, for that
* identifier. Will be @c 0 if @p policy passed is invalid.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI int elm_policy_get(unsigned int policy);
@@ -279,7 +279,7 @@ EAPI int elm_policy_get(unsigned int policy);
*
* @param lang Language to set, must be the full name of the locale
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_language_set(const char *lang);
@@ -299,7 +299,7 @@ typedef enum _Elm_Process_State
* background application is not user-visible or otherwise important and
* likely should release resources and not wake up often or process much.
*
- * @ingroup General
+ * @ingroup Elm_General
* @since 1.12
*/
EAPI Elm_Process_State elm_process_state_get(void);
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 7bef1af..93d2644 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -4164,8 +4164,7 @@ _elm_gengrid_item_new(Elm_Gengrid_Data *sd,
{
if (!itc) return NULL;
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_GENGRID_ITEM_CLASS, sd->obj);
+ Eo *eo_it = eo_add(ELM_GENGRID_ITEM_CLASS, sd->obj);
if (!eo_it) return NULL;
ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
@@ -4255,7 +4254,7 @@ _elm_gengrid_evas_object_smart_add(Eo *obj, Elm_Gengrid_Data *priv)
priv->highlight = EINA_TRUE;
priv->item_cache_max = CACHE_MAX;
- eo_add(&priv->pan_obj, MY_PAN_CLASS, evas_object_evas_get(obj));
+ priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
eo_data_ref(obj, NULL);
pan_data->wobj = obj;
@@ -4332,8 +4331,7 @@ EAPI Evas_Object *
elm_gengrid_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_gengrid.h b/src/lib/elm_gengrid.h
index f0c9800..0f6bc68 100644
--- a/src/lib/elm_gengrid.h
+++ b/src/lib/elm_gengrid.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Gengrid Gengrid (Generic grid)
+ * @defgroup Elm_Gengrid Gengrid (Generic grid)
* @ingroup Elementary
*
* @image html gengrid_inheritance_tree.png
@@ -271,7 +271,7 @@
*/
/**
- * @addtogroup Gengrid
+ * @addtogroup Elm_Gengrid
* @{
*/
diff --git a/src/lib/elm_gengrid_common.h b/src/lib/elm_gengrid_common.h
index 37e4214..cd08c03 100644
--- a/src/lib/elm_gengrid_common.h
+++ b/src/lib/elm_gengrid_common.h
@@ -35,7 +35,7 @@ typedef Elm_Gen_Item_Del_Cb Elm_Gengrid_Item_Del_Cb;
* @see elm_gengrid_item_class_free()
* @see elm_gengrid_item_append()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI Elm_Gengrid_Item_Class *elm_gengrid_item_class_new(void);
@@ -52,7 +52,7 @@ EAPI Elm_Gengrid_Item_Class *elm_gengrid_item_class_new(void);
* @see elm_gengrid_item_class_ref()
* @see elm_gengrid_item_class_unref()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_class_free(Elm_Gengrid_Item_Class *itc);
@@ -65,7 +65,7 @@ EAPI void elm_gengrid_item_class_free(Elm_Gengrid_Item_Class *itc);
*
* @see elm_gengrid_item_class_unref()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_class_ref(Elm_Gengrid_Item_Class *itc);
@@ -80,7 +80,7 @@ EAPI void elm_gengrid_item_class_ref(Elm_Gengrid_Item_Class *itc);
* @see elm_gengrid_item_class_ref()
* @see elm_gengrid_item_class_free()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_class_unref(Elm_Gengrid_Item_Class *itc);
@@ -99,7 +99,7 @@ EAPI void elm_gengrid_item_class_unref(Elm_Gengrid_Item_Class *itc);
* In order to set a content or something else as a tooltip, look at
* elm_gengrid_item_tooltip_content_cb_set().
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
@@ -127,7 +127,7 @@ EAPI void elm_gengrid_item_tooltip_text_set(Elm_Object_
* In order to set just a text as a tooltip, look at
* elm_gengrid_item_tooltip_text_set().
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
@@ -144,7 +144,7 @@ EAPI void elm_gengrid_item_tooltip_content_cb_set(Elm_O
*
* @see elm_gengrid_item_tooltip_content_cb_set()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Item *it);
@@ -167,7 +167,7 @@ EAPI void elm_gengrid_item_tooltip_unset(Elm_Object_Ite
*
* @see elm_gengrid_item_tooltip_style_get()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
@@ -181,7 +181,7 @@ EAPI void elm_gengrid_item_tooltip_style_set(Elm_Object
*
* @see elm_gengrid_item_tooltip_style_set() for more details
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI const char *elm_gengrid_item_tooltip_style_get(const Elm_Object_Item *it);
@@ -227,7 +227,7 @@ EAPI Eina_Bool elm_gengrid_item_tooltip_window_mode_get(cons
* @see elm_gengrid_item_cursor_get()
* @see elm_gengrid_item_cursor_unset()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_cursor_set(Elm_Object_Item *it, const char *cursor);
@@ -243,7 +243,7 @@ EAPI void elm_gengrid_item_cursor_set(Elm_Object_Item *
* @see elm_gengrid_item_cursor_set() for more details
* @see elm_gengrid_item_cursor_unset()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI const char *elm_gengrid_item_cursor_get(const Elm_Object_Item *it);
@@ -260,7 +260,7 @@ EAPI const char *elm_gengrid_item_cursor_get(const Elm_Object_
* @see elm_object_cursor_unset()
* @see elm_gengrid_item_cursor_set() for more details
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item *it);
@@ -285,7 +285,7 @@ EAPI void elm_gengrid_item_cursor_unset(Elm_Object_Item
* @see elm_gengrid_item_cursor_engine_only_set()
* @see elm_gengrid_item_cursor_style_get()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_cursor_style_set(Elm_Object_Item *it, const char *style);
@@ -299,7 +299,7 @@ EAPI void elm_gengrid_item_cursor_style_set(Elm_Object_
*
* @see elm_gengrid_item_cursor_style_set() for more details
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI const char *elm_gengrid_item_cursor_style_get(const Elm_Object_Item *it);
@@ -319,7 +319,7 @@ EAPI const char *elm_gengrid_item_cursor_style_get(const Elm_O
* @note By default, cursors will only be looked for between those
* provided by the rendering engine.
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only);
@@ -335,7 +335,7 @@ EAPI void elm_gengrid_item_cursor_engine_only_set(Elm_O
*
* @see elm_gengrid_item_cursor_engine_only_set(), for more details
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *it);
@@ -351,7 +351,7 @@ EAPI Eina_Bool elm_gengrid_item_cursor_engine_only_get(const
* gengrid. For example, @c (0, 1) would stand for first row,
* second column.
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_pos_get(const Elm_Object_Item *it, unsigned int *x, unsigned int *y);
@@ -379,7 +379,7 @@ EAPI void elm_gengrid_item_pos_get(const Elm_Object_Ite
*
* @see elm_gengrid_item_select_mode_get()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI void elm_gengrid_item_select_mode_set(Elm_Object_Item *it, Elm_Object_Select_Mode mode);
@@ -392,7 +392,7 @@ EAPI void elm_gengrid_item_select_mode_set(Elm_Object_I
*
* @see elm_gengrid_item_select_mode_set()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI Elm_Object_Select_Mode elm_gengrid_item_select_mode_get(const Elm_Object_Item *it);
diff --git a/src/lib/elm_gengrid_eo.h b/src/lib/elm_gengrid_eo.h
index 88a57bc..c319243 100644
--- a/src/lib/elm_gengrid_eo.h
+++ b/src/lib/elm_gengrid_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*
* @{
*/
diff --git a/src/lib/elm_gengrid_legacy.h b/src/lib/elm_gengrid_legacy.h
index 7fdd731..d1ee0cc 100644
--- a/src/lib/elm_gengrid_legacy.h
+++ b/src/lib/elm_gengrid_legacy.h
@@ -14,7 +14,7 @@
* @see elm_object_item_del()
* @see elm_gengrid_clear()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EAPI Evas_Object *elm_gengrid_add(Evas_Object *parent);
@@ -80,7 +80,7 @@ EINA_DEPRECATED EAPI void elm_gengrid_page_show(const E
*
* @see elm_gengrid_scroller_policy_get()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EINA_DEPRECATED EAPI void elm_gengrid_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -97,7 +97,7 @@ EINA_DEPRECATED EAPI void elm_gengrid_scroller_policy_set(Evas_Object *
*
* @see elm_gengrid_scroller_policy_set()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EINA_DEPRECATED EAPI void elm_gengrid_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
@@ -121,7 +121,7 @@ EINA_DEPRECATED EAPI void elm_gengrid_scroller_policy_get(const Evas_Ob
*
* @see elm_scroller_bounce_set()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EINA_DEPRECATED EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -139,7 +139,7 @@ EINA_DEPRECATED EAPI void elm_gengrid_bounce_set(Evas_Object *obj, Eina
*
* @see elm_scroller_bounce_get()
*
- * @ingroup Gengrid
+ * @ingroup Elm_Gengrid
*/
EINA_DEPRECATED EAPI void elm_gengrid_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 70711cd..ba152c7 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -874,7 +874,7 @@ _elm_genlist_elm_layout_sizing_eval(Eo *obj, Elm_Genlist_Data *sd)
edje_object_size_min_calc(wd->resize_obj, &vmw, &vmh);
- if ((sd->mode == ELM_LIST_SCROLL) || (sd->mode == ELM_LIST_COMPRESS))
+ if (sd->mode == ELM_LIST_COMPRESS)
{
Evas_Coord vw = 0, vh = 0;
@@ -5569,7 +5569,7 @@ _elm_genlist_evas_object_smart_add(Eo *obj, Elm_Genlist_Data *priv)
priv->longpress_timeout = _elm_config->longpress_timeout;
priv->highlight = EINA_TRUE;
- eo_add(&priv->pan_obj, MY_PAN_CLASS, evas_object_evas_get(obj));
+ priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
eo_data_ref(obj, NULL);
pan_data->wobj = obj;
@@ -5688,8 +5688,7 @@ EAPI Evas_Object *
elm_genlist_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -6033,8 +6032,7 @@ _elm_genlist_item_new(Elm_Genlist_Data *sd,
if (!itc) return NULL;
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_GENLIST_ITEM_CLASS, sd->obj);
+ Eo *eo_it = eo_add(ELM_GENLIST_ITEM_CLASS, sd->obj);
if (!eo_it) return NULL;
ELM_GENLIST_ITEM_DATA_GET(eo_it, it);
@@ -7333,7 +7331,7 @@ elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
EOLIAN static int
_elm_genlist_item_index_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
{
- int cnt = 0;
+ int cnt = 1;
Elm_Gen_Item *tmp;
ELM_GENLIST_ITEM_CHECK_OR_RETURN(it, -1);
diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index 5721e32..04ad5b9 100644
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Genlist Genlist (Generic list)
+ * @defgroup Elm_Genlist Genlist (Generic list)
* @ingroup Elementary
*
* @image html genlist_inheritance_tree.png
@@ -411,7 +411,7 @@
*/
/**
- * @addtogroup Genlist
+ * @addtogroup Elm_Genlist
* @{
*/
diff --git a/src/lib/elm_genlist_common.h b/src/lib/elm_genlist_common.h
index c2a2ee1..0b56d0e 100644
--- a/src/lib/elm_genlist_common.h
+++ b/src/lib/elm_genlist_common.h
@@ -44,7 +44,7 @@ typedef Elm_Gen_Item_Reusable_Content_Get_Cb Elm_Genlist_Reusable_Content_Get_Cb
* @see elm_genlist_item_class_free()
* @see elm_genlist_item_append()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI Elm_Genlist_Item_Class *elm_genlist_item_class_new(void);
@@ -61,7 +61,7 @@ EAPI Elm_Genlist_Item_Class *elm_genlist_item_class_new(void);
* @see elm_genlist_item_class_ref()
* @see elm_genlist_item_class_unref()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_class_free(Elm_Genlist_Item_Class *itc);
@@ -74,7 +74,7 @@ EAPI void elm_genlist_item_class_free(Elm_Genlist_Item_Class *itc);
*
* @see elm_genlist_item_class_unref()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_class_ref(Elm_Genlist_Item_Class *itc);
@@ -89,7 +89,7 @@ EAPI void elm_genlist_item_class_ref(Elm_Genlist_Item_Class *itc);
* @see elm_genlist_item_class_ref()
* @see elm_genlist_item_class_free()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_class_unref(Elm_Genlist_Item_Class *itc);
@@ -108,7 +108,7 @@ EAPI void elm_genlist_item_class_unref(Elm_Genlist_Item_Class *itc);
* In order to set a content or something else as a tooltip, look at
* elm_genlist_item_tooltip_content_cb_set().
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
@@ -136,7 +136,7 @@ EAPI void elm_genlist_item_tooltip_text_set(Elm_Object_
* In order to set just a text as a tooltip, look at
* elm_genlist_item_tooltip_text_set().
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
@@ -153,7 +153,7 @@ EAPI void elm_genlist_item_tooltip_content_cb_set(Elm_O
*
* @see elm_genlist_item_tooltip_content_cb_set()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_tooltip_unset(Elm_Object_Item *it);
@@ -176,7 +176,7 @@ EAPI void elm_genlist_item_tooltip_unset(Elm_Object_Ite
*
* @see elm_genlist_item_tooltip_style_get()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
@@ -190,7 +190,7 @@ EAPI void elm_genlist_item_tooltip_style_set(Elm_Object
*
* @see elm_genlist_item_tooltip_style_set() for more details
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI const char *elm_genlist_item_tooltip_style_get(const Elm_Object_Item *it);
@@ -236,7 +236,7 @@ EAPI Eina_Bool elm_genlist_item_tooltip_window_mode_get(cons
* @see elm_genlist_item_cursor_get()
* @see elm_genlist_item_cursor_unset()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_cursor_set(Elm_Object_Item *it, const char *cursor);
@@ -252,7 +252,7 @@ EAPI void elm_genlist_item_cursor_set(Elm_Object_Item *
* @see elm_genlist_item_cursor_set() for more details
* @see elm_genlist_item_cursor_unset()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI const char *elm_genlist_item_cursor_get(const Elm_Object_Item *it);
@@ -269,7 +269,7 @@ EAPI const char *elm_genlist_item_cursor_get(const Elm_Object_
* @see elm_object_cursor_unset()
* @see elm_genlist_item_cursor_set() for more details
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_cursor_unset(Elm_Object_Item *it);
@@ -294,7 +294,7 @@ EAPI void elm_genlist_item_cursor_unset(Elm_Object_Item
* @see elm_genlist_item_cursor_engine_only_set()
* @see elm_genlist_item_cursor_style_get()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_cursor_style_set(Elm_Object_Item *it, const char *style);
@@ -308,7 +308,7 @@ EAPI void elm_genlist_item_cursor_style_set(Elm_Object_
*
* @see elm_genlist_item_cursor_style_set() for more details
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI const char *elm_genlist_item_cursor_style_get(const Elm_Object_Item *it);
@@ -328,7 +328,7 @@ EAPI const char *elm_genlist_item_cursor_style_get(const Elm_O
* @note By default, cursors will only be looked for between those
* provided by the rendering engine.
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI void elm_genlist_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only);
@@ -344,7 +344,7 @@ EAPI void elm_genlist_item_cursor_engine_only_set(Elm_O
*
* @see elm_genlist_item_cursor_engine_only_set(), for more details
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI Eina_Bool elm_genlist_item_cursor_engine_only_get(const Elm_Object_Item *it);
diff --git a/src/lib/elm_genlist_eo.h b/src/lib/elm_genlist_eo.h
index bd18b5b..1eab463 100644
--- a/src/lib/elm_genlist_eo.h
+++ b/src/lib/elm_genlist_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*
* @{
*/
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index e8fd4d5..5a966c0 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -170,7 +170,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
get {
[[Get the index of the item. It is only valid once displayed.
- The index start from 0.
+ The index start from 1.
]]
}
values {
diff --git a/src/lib/elm_genlist_legacy.h b/src/lib/elm_genlist_legacy.h
index 77866c0..3817f05 100644
--- a/src/lib/elm_genlist_legacy.h
+++ b/src/lib/elm_genlist_legacy.h
@@ -11,7 +11,7 @@
* @see elm_object_item_del()
* @see elm_genlist_clear()
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 82c0eef1..27d60b7 100644
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -3817,8 +3817,7 @@ EAPI Evas_Object *
elm_gesture_layer_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_getting_started.h b/src/lib/elm_getting_started.h
index 27f6687..9813a61 100644
--- a/src/lib/elm_getting_started.h
+++ b/src/lib/elm_getting_started.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Start Getting Started
+ * @defgroup Elm_Start Getting Started
* @ingroup Elementary
*
* To write an Elementary app, you can get started with the following:
diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index d20d67d..31d54f2 100644
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -323,8 +323,7 @@ EAPI Evas_Object *
elm_glview_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent, elm_obj_glview_version_constructor(obj, EVAS_GL_GLES_2_X));
+ Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, EVAS_GL_GLES_2_X));
return obj;
}
@@ -332,8 +331,7 @@ EAPI Evas_Object *
elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Version version)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent, elm_obj_glview_version_constructor(obj, version));
+ Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_glview_version_constructor(eo_self, version));
return obj;
}
diff --git a/src/lib/elm_glview.h b/src/lib/elm_glview.h
index 7a99d55..d1c6672 100644
--- a/src/lib/elm_glview.h
+++ b/src/lib/elm_glview.h
@@ -1,5 +1,5 @@
/**
- * @defgroup GLView GLView
+ * @defgroup Elm_GLView GLView
* @ingroup Elementary
*
* @image html glview_inheritance_tree.png
@@ -23,7 +23,7 @@
*/
/**
- * @ingroup GLView
+ * @ingroup Elm_GLView
*/
#include "elm_glview_common.h"
diff --git a/src/lib/elm_glview_common.h b/src/lib/elm_glview_common.h
index 12c69ec..c84d49b 100644
--- a/src/lib/elm_glview_common.h
+++ b/src/lib/elm_glview_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup GLView
+ * @addtogroup Elm_GLView
*
* @{
*/
diff --git a/src/lib/elm_glview_legacy.h b/src/lib/elm_glview_legacy.h
index 08dda73..1f0bea4 100644
--- a/src/lib/elm_glview_legacy.h
+++ b/src/lib/elm_glview_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup GLView
+ * @ingroup Elm_GLView
*/
EAPI Evas_Object *elm_glview_add(Evas_Object *parent);
@@ -25,8 +25,68 @@ EAPI Evas_Object *elm_glview_version_add(Evas_Object *parent, Evas_GL_Context_Ve
*
* @param obj The GLView object
*
- * @ingroup GLView
+ * @ingroup Elm_GLView
*/
EAPI void elm_glview_changed_set(Evas_Object *obj);
+/**
+ * Gets the size of the GLView.
+ *
+ * @param obj The GLView object
+ * @param w pointer of int width
+ * @param h pointer of int height
+ *
+ * @ingroup Elm_GLView
+ */
+EAPI void elm_glview_size_get(const Evas_Object *obj, int *w, int *h);
+
+/**
+ * Sets the size of the GLView.
+ *
+ * @param obj The GLView object
+ * @param w width of GLView
+ * @param h height of GLView
+ *
+ * @ingroup Elm_GLView
+ */
+EAPI void elm_glview_size_set(Evas_Object *obj, int w, int h);
+
+/**
+ * Set the init function that runs once in the main loop.
+ * @param obj The GLView object
+ * @param func The callback function
+ *
+ * @ingroup GLView
+ */
+EAPI void elm_glview_init_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
+
+/**
+ * Set the delete function that runs in the main loop.
+ *
+ * @param obj The GLView object
+ * @param func The callback function
+ *
+ * @ingroup Elm_GLView
+ */
+EAPI void elm_glview_del_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
+
+/**
+ * Set the resize function that gets called when resize happens.
+ *
+ * @param obj The GLView object
+ * @param func The callback function
+ *
+ * @ingroup Elm_GLView
+ */
+EAPI void elm_glview_resize_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
+
+/**
+ * Set the render function that runs in the main loop.
+ *
+ * @param obj The GLView object
+ * @param func The callback function
+ *
+ * @ingroup Elm_GLView
+ */
+EAPI void elm_glview_render_func_set(Evas_Object *obj, Elm_GLView_Func_Cb func);
#include "elm_glview.eo.legacy.h"
diff --git a/src/lib/elm_grid.c b/src/lib/elm_grid.c
index a5b12d0..957823c 100644
--- a/src/lib/elm_grid.c
+++ b/src/lib/elm_grid.c
@@ -161,8 +161,7 @@ EAPI Evas_Object *
elm_grid_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_grid.h b/src/lib/elm_grid.h
index 1f6e511..394bfc8 100644
--- a/src/lib/elm_grid.h
+++ b/src/lib/elm_grid.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Grid Grid
+ * @defgroup Elm_Grid Grid
* @ingroup Elementary
*
* @image html grid_inheritance_tree.png
diff --git a/src/lib/elm_grid_eo.h b/src/lib/elm_grid_eo.h
index 66d4d77..6e31160 100644
--- a/src/lib/elm_grid_eo.h
+++ b/src/lib/elm_grid_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Grid
+ * @ingroup Elm_Grid
*
* @{
*/
diff --git a/src/lib/elm_grid_legacy.h b/src/lib/elm_grid_legacy.h
index 4fa78f5..d67c921 100644
--- a/src/lib/elm_grid_legacy.h
+++ b/src/lib/elm_grid_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Grid
+ * @ingroup Elm_Grid
*/
EAPI Evas_Object *elm_grid_add(Evas_Object *parent);
@@ -17,7 +17,7 @@ EAPI Evas_Object *elm_grid_add(Evas_Object *parent);
* @param w The virtual width at which to pack it
* @param h The virtual height at which to pack it
*
- * @ingroup Grid
+ * @ingroup Elm_Grid
*/
EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
@@ -30,7 +30,7 @@ EAPI void elm_grid_pack_set(Evas_Object *subobj, Evas_Coord x, Evas_Coor
* @param w Pointer to integer to store the virtual width
* @param h Pointer to integer to store the virtual height
*
- * @ingroup Grid
+ * @ingroup Elm_Grid
*/
EAPI void elm_grid_pack_get(Evas_Object *subobj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 01da062..22b7e3d 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -670,8 +670,7 @@ EAPI Evas_Object *
elm_hover_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h
index 1563265..7e4f3f3 100644
--- a/src/lib/elm_hover.h
+++ b/src/lib/elm_hover.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Hover Hover
+ * @defgroup Elm_Hover Hover
* @ingroup Elementary
*
* @image html hover_inheritance_tree.png
diff --git a/src/lib/elm_hover_legacy.h b/src/lib/elm_hover_legacy.h
index fdb5e62..407d97e 100644
--- a/src/lib/elm_hover_legacy.h
+++ b/src/lib/elm_hover_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The hover object or NULL if one could not be created
*
- * @ingroup Hover
+ * @ingroup Elm_Hover
*/
EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
@@ -17,7 +17,7 @@ EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
* This function will cause the hover to take up the entire space that the
* parent object fills.
*
- * @ingroup Hover
+ * @ingroup Elm_Hover
*/
EAPI void elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
@@ -29,7 +29,7 @@ EAPI void elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
*
* @see elm_hover_parent_set()
*
- * @ingroup Hover
+ * @ingroup Elm_Hover
*/
EAPI Evas_Object *elm_hover_parent_get(const Evas_Object *obj);
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 99d9c36..e2ec161 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -659,8 +659,7 @@ EAPI Evas_Object *
elm_icon_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index 3420fbd..a53a95b 100644
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Icon Icon
+ * @defgroup Elm_Icon Icon
* @ingroup Elementary
*
* @image html icon_inheritance_tree.png
diff --git a/src/lib/elm_icon_legacy.h b/src/lib/elm_icon_legacy.h
index edf51db..a034a68 100644
--- a/src/lib/elm_icon_legacy.h
+++ b/src/lib/elm_icon_legacy.h
@@ -6,7 +6,7 @@
*
* @see elm_image_file_set()
*
- * @ingroup Icon
+ * @ingroup Elm_Icon
*/
EAPI Evas_Object *elm_icon_add(Evas_Object *parent);
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 045fb8e..9edeea9 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -34,7 +34,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
};
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
-static void _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, const Eina_File *f, const char *key, Eina_Bool *ret);
+static Eina_Bool _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, const Eina_File *f, const char *key);
static const Elm_Action key_actions[] = {
{"activate", _key_action_activate},
@@ -375,23 +375,12 @@ _elm_image_async_open_done(void *data, Ecore_Thread *thread EINA_UNUSED)
else
file = f ? eina_file_filename_get(f) : NULL;
- if (sd->edje)
- {
- if (ok) ok = edje_object_mmap_set(sd->img, f, key);
- if (!ok)
- {
- ERR("failed to open edje file '%s', group '%s': %s", file, key,
- edje_load_error_str(edje_object_load_error_get(sd->img)));
- }
- }
- else
+ if (ok)
{
- if (ok) _elm_image_smart_internal_file_set(obj, sd, file, f, key, &ok);
- if (!ok)
- {
- ERR("failed to open image file '%s', key '%s': %s", file, key,
- evas_load_error_str(evas_object_image_load_error_get(sd->img)));
- }
+ if (sd->edje)
+ ok = edje_object_mmap_set(sd->img, f, key);
+ else
+ ok = _elm_image_smart_internal_file_set(obj, sd, file, f, key);
}
if (ok)
@@ -899,6 +888,8 @@ _elm_image_file_set_do(Evas_Object *obj)
EOLIAN static Eina_Bool
_elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const void *img, size_t size, const char *format, const char *key)
{
+ Evas_Load_Error err;
+
_elm_image_file_set_do(obj);
evas_object_image_memfile_set
@@ -907,11 +898,12 @@ _elm_image_memfile_set(Eo *obj, Elm_Image_Data *sd, const void *img, size_t size
sd->preload_status = ELM_IMAGE_PRELOADING;
evas_object_image_preload(sd->img, EINA_FALSE);
- if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE)
+ err = evas_object_image_load_error_get(sd->img);
+ if (err != EVAS_LOAD_ERROR_NONE)
{
if (img)
- ERR("Things are going bad for some random " FMT_SIZE_T
- " byte chunk of memory (%p)", size, sd->img);
+ ERR("Failed to load image from memory block (" FMT_SIZE_T
+ " bytes): %s (%p)", size, evas_load_error_str(err), sd->img);
else
ERR("NULL image data passed (%p)", sd->img);
return EINA_FALSE;
@@ -940,8 +932,7 @@ EAPI Evas_Object *
elm_image_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -999,16 +990,14 @@ _elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *pd EINA_UNUSED,
return ret;
}
-static void
+static Eina_Bool
_elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
- const char *file, const Eina_File *f, const char *key, Eina_Bool *ret)
+ const char *file, const Eina_File *f, const char *key)
{
+ Evas_Load_Error err;
+
if (eina_str_has_extension(file, ".edj"))
- {
- Eina_Bool int_ret = _elm_image_edje_file_set(obj, file, f, key);
- if (ret) *ret = int_ret;
- return;
- }
+ return _elm_image_edje_file_set(obj, file, f, key);
_elm_image_file_set_do(obj);
@@ -1017,14 +1006,25 @@ _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
else
evas_object_image_file_set(sd->img, file, key);
- if (evas_object_image_load_error_get(sd->img) != EVAS_LOAD_ERROR_NONE)
+ err = evas_object_image_load_error_get(sd->img);
+ if (err != EVAS_LOAD_ERROR_NONE)
{
- if (file)
- ERR("Things are going bad for '%s' (%p)", file, sd->img);
+ if (file || f)
+ {
+ if (key)
+ ERR("Failed to load image '%s' '%s': %s. (%p)",
+ file ? file : eina_file_filename_get(f), key,
+ evas_load_error_str(err), obj);
+ else
+ ERR("Failed to load image '%s': %s. (%p)",
+ file ? file : eina_file_filename_get(f),
+ evas_load_error_str(err), obj);
+ }
else
- ERR("NULL image file passed (%p)", sd->img);
- if (ret) *ret = EINA_FALSE;
- return;
+ {
+ ERR("NULL image file passed! (%p)", obj);
+ }
+ return EINA_FALSE;
}
if (sd->preload_status != ELM_IMAGE_PRELOAD_DISABLED)
@@ -1036,11 +1036,11 @@ _elm_image_smart_internal_file_set(Eo *obj, Elm_Image_Data *sd,
_elm_image_internal_sizing_eval(obj, sd);
- if (ret) *ret = EINA_TRUE;
+ return EINA_TRUE;
}
static void
-_elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf *download)
+_elm_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *download)
{
Eo *obj = data;
Elm_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
@@ -1054,7 +1054,7 @@ _elm_image_smart_download_done(void *data, Elm_Url *url EINA_UNUSED, Eina_Binbuf
f = eina_file_virtualize(_elm_url_get(url),
sd->remote_data, length,
EINA_FALSE);
- _elm_image_smart_internal_file_set(obj, sd, _elm_url_get(url), f, sd->key, &ret);
+ ret = _elm_image_smart_internal_file_set(obj, sd, _elm_url_get(url), f, sd->key);
eina_file_close(f);
sd->remote = NULL;
@@ -1145,7 +1145,7 @@ _elm_image_efl_file_file_set(Eo *obj, Elm_Image_Data *sd, const char *file, cons
}
if (!sd->async_enable)
- _elm_image_smart_internal_file_set(obj, sd, file, NULL, key, &ret);
+ ret = _elm_image_smart_internal_file_set(obj, sd, file, NULL, key);
else
ret = _elm_image_async_file_set(obj, sd, file, NULL, key);
@@ -1202,11 +1202,7 @@ _elm_image_mmap_set(Eo *obj, Elm_Image_Data *sd, const Eina_File *f, const char
sd->remote = NULL;
if (!sd->async_enable)
- {
- _elm_image_smart_internal_file_set(obj, sd,
- eina_file_filename_get(f), f,
- key, &ret);
- }
+ ret = _elm_image_smart_internal_file_set(obj, sd, eina_file_filename_get(f), f, key);
else
ret = _elm_image_async_file_set(obj, sd, eina_file_filename_get(f), f, key);
@@ -1226,20 +1222,6 @@ _elm_image_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, const char
efl_file_get(sd->img, file, key);
}
-EOLIAN static void
-_elm_image_smooth_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool smooth)
-{
- sd->smooth = smooth;
-
- elm_obj_image_sizing_eval(obj);
-}
-
-EOLIAN static Eina_Bool
-_elm_image_smooth_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
-{
- return sd->smooth;
-}
-
static Eina_Bool
_elm_image_efl_file_async_wait(const Eo *obj EINA_UNUSED, Elm_Image_Data *pd)
{
@@ -1371,7 +1353,7 @@ elm_image_prescale_set(Evas_Object *obj,
}
EOLIAN static void
-_elm_image_efl_image_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int w, int h)
+_elm_image_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int w, int h)
{
if (w > h)
sd->load_size = w;
@@ -1390,7 +1372,7 @@ elm_image_prescale_get(const Evas_Object *obj)
}
EOLIAN static void
-_elm_image_efl_image_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
+_elm_image_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
{
if (w) *w = sd->load_size;
if (h) *h = sd->load_size;
@@ -1402,7 +1384,7 @@ _elm_image_orient_set(Eo *obj, Elm_Image_Data *sd, Elm_Image_Orient orient)
if (sd->edje) return;
if (sd->orient == orient) return;
- evas_object_image_orient_set(sd->img, orient);
+ evas_object_image_orient_set(sd->img, (Evas_Image_Orient) orient);
sd->orient = orient;
_elm_image_internal_sizing_eval(obj, sd);
}
@@ -1417,7 +1399,7 @@ _elm_image_orient_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
* Turns on editing through drag and drop and copy and paste.
*/
EOLIAN static void
-_elm_image_editable_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool edit)
+_elm_image_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool edit)
{
if (sd->edje)
{
@@ -1448,7 +1430,7 @@ _elm_image_editable_set(Eo *obj, Elm_Image_Data *sd, Eina_Bool edit)
}
EOLIAN static Eina_Bool
-_elm_image_editable_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
+_elm_image_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
{
return sd->edit;
}
@@ -1648,7 +1630,32 @@ _elm_image_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
return &atspi_actions[0];
}
+EAPI void
+elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth)
+{
+ efl_image_smooth_scale_set(obj, smooth);
+ elm_obj_image_sizing_eval(obj);
+}
+
+EAPI Eina_Bool
+elm_image_smooth_get(const Evas_Object *obj)
+{
+ return efl_image_smooth_scale_get(obj);
+}
// A11Y - END
+/* Legacy deprecated functions */
+EAPI void
+elm_image_editable_set(Evas_Object *obj, Eina_Bool edit)
+{
+ evas_draggable_interface_drag_target_set(obj, edit);
+}
+
+EAPI Eina_Bool
+elm_image_editable_get(const Evas_Object *obj)
+{
+ return evas_draggable_interface_drag_target_get(obj);
+}
+
#include "elm_image.eo.c"
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index b458872..f3c8cbb 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -41,26 +41,13 @@ struct Elm.Image.Error
open_error: Eina.Bool;
}
-class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
- Edje.Object,
+class Elm.Image (Elm.Widget, Efl.File, Efl.Image_Load, Evas.Clickable_Interface,
+ Edje.Object, Efl.Image, Evas.Draggable_Interface,
Elm.Interface_Atspi_Image, Elm.Interface_Atspi_Widget_Action,
Efl.Player)
{
eo_prefix: elm_obj_image;
methods {
- @property editable {
- [[Contrtol if thhe image is 'editable'.
-
- This means the image is a valid drag target for drag and drop, and can be
- cut or pasted too.]]
- set {
- }
- get {
- }
- values {
- set: bool; [[Turn on or off editability. Default is $false.]]
- }
- }
@property resize_down {
[[Control whether the object's image can be resized to a size smaller than the original one.
@@ -89,24 +76,6 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
resize_up: bool; [[whether resizing up is allowed]]
}
}
- @property smooth {
- [[Control the smooth effect for an image.
-
- Set the scaling algorithm to be used when scaling the image. Smooth
- scaling provides a better resulting image, but is slower.
-
- The smooth scaling should be disabled when making animations that change
- the image size, since it will be faster. Animations that don't require
- resizing of the image can keep the smooth scaling enabled (even if the
- image is already scaled, since the scaled image will be cached).]]
- set {
- }
- get {
- }
- values {
- smooth: bool; [[$true if smooth scaling should be used, $false otherwise. Default is $true.]]
- }
- }
@property no_scale {
[[Control scaling behaviour of this object.
@@ -317,8 +286,8 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
Efl.File.async.set;
Efl.File.async.get;
Efl.File.async_wait;
- Efl.Image.load_size.set;
- Efl.Image.load_size.get;
+ Efl.Image_Load.load_size.set;
+ Efl.Image_Load.load_size.get;
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
Efl.Player.playable.get;
@@ -339,6 +308,8 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
Evas.Object_Smart.del;
Evas.Object_Smart.member_add;
Evas.Object_Smart.resize;
+ Evas.Draggable_Interface.drag_target.set;
+ Evas.Draggable_Interface.drag_target.get;
Elm.Widget.theme_apply;
Elm.Widget.event;
Elm.Interface_Atspi_Image.extents.get;
diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h
index c14dc23..693086d 100644
--- a/src/lib/elm_image.h
+++ b/src/lib/elm_image.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Image Image
+ * @defgroup Elm_Image Image
* @ingroup Elementary
*
* @image html image_inheritance_tree.png
@@ -37,7 +37,7 @@
/**
- * @addtogroup Image
+ * @addtogroup Elm_Image
* @{
*/
diff --git a/src/lib/elm_image_eo.h b/src/lib/elm_image_eo.h
index c423e65..22896e7 100644
--- a/src/lib/elm_image_eo.h
+++ b/src/lib/elm_image_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Image
+ * @ingroup Elm_Image
*
* @{
*/
diff --git a/src/lib/elm_image_legacy.h b/src/lib/elm_image_legacy.h
index 5d6a06f..01df5fe 100644
--- a/src/lib/elm_image_legacy.h
+++ b/src/lib/elm_image_legacy.h
@@ -6,7 +6,7 @@
*
* @see elm_image_file_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
*/
EAPI Evas_Object *elm_image_add(Evas_Object *parent);
@@ -32,7 +32,7 @@ EAPI Evas_Object *elm_image_add(Evas_Object *parent);
* Or image objects will share one evas image cache entry and you will get
* unwanted frames.
*
- * @ingroup Image
+ * @ingroup Elm_Image
*/
EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, const char *group);
@@ -41,7 +41,7 @@ EAPI Eina_Bool elm_image_file_set(Evas_Object *obj, const char *file, con
*
* @see elm_image_file_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
*
* @param[out] file The path to file that will be used as image source
* @param[out] group The group that the image belongs to, in case it's an
@@ -70,7 +70,7 @@ EAPI void elm_image_file_get(const Eo *obj, const char **file, const char **grou
* @see elm_image_prescale_get()
* @see elm_bg_load_size_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
*/
EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
@@ -82,7 +82,7 @@ EAPI void elm_image_prescale_set(Evas_Object *obj, int size);
*
* @see elm_image_prescale_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
*/
EAPI int elm_image_prescale_get(const Evas_Object *obj);
@@ -108,11 +108,48 @@ EAPI int elm_image_prescale_get(const Evas_Object *obj);
* Or image objects will share one evas image cache entry and you will get
* unwanted frames.
*
- * @ingroup Image
+ * @ingroup Elm_Image
*/
EAPI Eina_Bool elm_image_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group);
/**
+ * @brief Control the smooth effect for an image.
+ *
+ * Set the scaling algorithm to be used when scaling the image. Smooth scaling
+ * provides a better resulting image, but is slower.
+ *
+ * The smooth scaling should be disabled when making animations that change the
+ * image size, since it will be faster. Animations that don't require resizing
+ * of the image can keep the smooth scaling enabled (even if the image is
+ * already scaled, since the scaled image will be cached).
+ *
+ * @param[in] smooth @c true if smooth scaling should be used, @c false
+ * otherwise. Default is @c true.
+ *
+ * @ingroup Elm_Image
+ */
+EAPI void elm_image_smooth_set(Evas_Object *obj, Eina_Bool smooth);
+
+/**
+ * @brief Get the smooth effect for an image.
+ *
+ * Get the scaling algorithm to be used when scaling the image. Smooth scaling
+ * provides a better resulting image, but is slower.
+ *
+ * The smooth scaling should be disabled when making animations that change the
+ * image size, since it will be faster. Animations that don't require resizing
+ * of the image can keep the smooth scaling enabled (even if the image is
+ * already scaled, since the scaled image will be cached).
+ *
+ * @return @c true if smooth scaling should be used, @c false otherwise.
+ * Default is @c true.
+ *
+ * @ingroup Elm_Image
+ */
+EAPI Eina_Bool elm_image_smooth_get(const Evas_Object *obj);
+
+
+/**
* Start or stop an image object's animation.
*
* To actually start playing any image object's animation, if it
@@ -134,7 +171,7 @@ EAPI Eina_Bool elm_image_mmap_set(Evas_Object *obj, const Eina_File *file
* @see elm_image_animated_set()
* @see elm_image_animated_play_get()
*
- * @ingroup Image
+ * @ingroup Elm_Image
* @since 1.7
*
* @param[in] play @c EINA_TRUE to start the animation, @c EINA_FALSE
@@ -150,7 +187,7 @@ EAPI void elm_image_animated_play_set(Evas_Object *obj, Eina_Bool pl
*
* @see elm_image_animated_play_get()
*
- * @ingroup Image
+ * @ingroup Elm_Image
* @since 1.7
*/
EAPI Eina_Bool elm_image_animated_play_get(const Evas_Object *obj);
@@ -169,7 +206,7 @@ EAPI Eina_Bool elm_image_animated_play_get(const Evas_Object *obj);
* @see elm_image_animated_available_get()
* @see elm_image_animated_play_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
* @since 1.7
*
* @param[in] anim @c EINA_TRUE if the object is to animate itself,
@@ -186,7 +223,7 @@ EAPI void elm_image_animated_set(Evas_Object *obj, Eina_Bool anim);
*
* @see elm_image_animated_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
* @since 1.7
*
*/
@@ -206,10 +243,33 @@ EAPI Eina_Bool elm_image_animated_get(const Evas_Object *obj);
*
* @see elm_image_animated_set()
*
- * @ingroup Image
+ * @ingroup Elm_Image
* @since 1.7
*
*/
EAPI Eina_Bool elm_image_animated_available_get(const Evas_Object *obj);
+/**
+ * @brief Contrtol if the image is 'editable'.
+ *
+ * This means the image is a valid drag target for drag and drop, and can be
+ * cut or pasted too.
+ *
+ * @param[in] set Turn on or off editability. Default is @c false.
+ *
+ * @ingroup Elm_Image
+ */
+EAPI void elm_image_editable_set(Evas_Object *obj, Eina_Bool set);
+
+/**
+ * @brief Contrtol if the image is 'editable'.
+ *
+ * This means the image is a valid drag target for drag and drop, and can be
+ * cut or pasted too.
+ *
+ * @return Turn on or off editability. Default is @c false.
+ *
+ * @ingroup Elm_Image
+ */
+EAPI Eina_Bool elm_image_editable_get(const Evas_Object *obj);
#include "elm_image.eo.legacy.h"
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 808f90f..c6cf6b3 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -546,7 +546,7 @@ _item_new(Evas_Object *obj,
ELM_INDEX_DATA_GET(obj, sd);
- eo_add(&eo_item, ELM_INDEX_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_INDEX_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_INDEX_ITEM_DATA_GET(eo_item, it);
@@ -1221,8 +1221,7 @@ EAPI Evas_Object *
elm_index_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_index.h b/src/lib/elm_index.h
index 32e91fb..538e96b 100644
--- a/src/lib/elm_index.h
+++ b/src/lib/elm_index.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Index Index
+ * @defgroup Elm_Index Index
* @ingroup Elementary
*
* @image html index_inheritance_tree.png
@@ -58,7 +58,7 @@
*/
/**
- * @addtogroup Index
+ * @addtogroup Elm_Index
* @{
*/
diff --git a/src/lib/elm_index_eo.h b/src/lib/elm_index_eo.h
index c46708d..9ca6418 100644
--- a/src/lib/elm_index_eo.h
+++ b/src/lib/elm_index_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Index
+ * @ingroup Elm_Index
*
* @{
*/
diff --git a/src/lib/elm_index_legacy.h b/src/lib/elm_index_legacy.h
index 7846f64..262aaf9 100644
--- a/src/lib/elm_index_legacy.h
+++ b/src/lib/elm_index_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new index widget on the canvas.
*
- * @ingroup Index
+ * @ingroup Elm_Index
*/
EAPI Evas_Object *elm_index_add(Evas_Object *parent);
diff --git a/src/lib/elm_interface_atspi_accessible.c b/src/lib/elm_interface_atspi_accessible.c
index 1fec0a3..1e9d1a2 100644
--- a/src/lib/elm_interface_atspi_accessible.c
+++ b/src/lib/elm_interface_atspi_accessible.c
@@ -573,7 +573,7 @@ EOLIAN Eo*
_elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
{
if (!root)
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
return root;
}
diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 1962441..f40552c 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -226,8 +226,7 @@ _elm_pan_gravity_get(Eo *obj EINA_UNUSED, Elm_Pan_Smart_Data *psd, double *x, do
static Evas_Object *
_elm_pan_add(Evas *evas)
{
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_PAN_CLASS, evas);
+ Evas_Object *obj = eo_add(MY_PAN_CLASS, evas);
return obj;
}
@@ -802,6 +801,7 @@ _elm_scroll_scroll_bar_size_adjust(Elm_Scrollable_Smart_Interface_Data *sid)
minx = 0, miny = 0;
double vx, vy, size;
+ edje_object_calc_force(sid->edje_obj);
edje_object_part_geometry_get
(sid->edje_obj, "elm.swallow.content", NULL, NULL, &vw, &vh);
w = sid->content_info.w;
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index e505bfe..1c673b7 100644
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -96,8 +96,7 @@ EAPI Evas_Object *
elm_win_inwin_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_inwin.h b/src/lib/elm_inwin.h
index 85335ab..a4448a1 100644
--- a/src/lib/elm_inwin.h
+++ b/src/lib/elm_inwin.h
@@ -1,6 +1,6 @@
/**
- * @defgroup Inwin Inwin
- * @ingroup Win
+ * @defgroup Elm_Inwin Inwin
+ * @ingroup Elm_Win
*
* @image html inwin_inheritance_tree.png
* @image latex inwin_inheritance_tree.eps
diff --git a/src/lib/elm_inwin_legacy.h b/src/lib/elm_inwin_legacy.h
index 20698c0..a085db0 100644
--- a/src/lib/elm_inwin_legacy.h
+++ b/src/lib/elm_inwin_legacy.h
@@ -14,7 +14,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
*/
EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
@@ -28,7 +28,7 @@ EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
* @param obj The inwin object
* @param content The object to set as content
*
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
*/
EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content);
@@ -47,7 +47,7 @@ EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *conte
* @param obj The inwin object
* @return The content that is being used
*
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
*/
EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
@@ -59,7 +59,7 @@ EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
* @param obj The inwin object
* @return The content that was being used
*
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
*/
EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 1f2ff63..6887a5f 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -404,8 +404,7 @@ EAPI Evas_Object *
elm_label_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_label.h b/src/lib/elm_label.h
index d6187ef..83e497f 100644
--- a/src/lib/elm_label.h
+++ b/src/lib/elm_label.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Label Label
+ * @defgroup Elm_Label Label
* @ingroup Elementary
*
* @image html label_inheritance_tree.png
diff --git a/src/lib/elm_label_eo.h b/src/lib/elm_label_eo.h
index 1355127..2666758 100644
--- a/src/lib/elm_label_eo.h
+++ b/src/lib/elm_label_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Label
+ * @ingroup Elm_Label
*
* @{
*/
diff --git a/src/lib/elm_label_legacy.h b/src/lib/elm_label_legacy.h
index dd48b82..f072006 100644
--- a/src/lib/elm_label_legacy.h
+++ b/src/lib/elm_label_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Label
+ * @ingroup Elm_Label
*/
EAPI Evas_Object *elm_label_add(Evas_Object *parent);
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 389f95a..8058b83 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -1771,8 +1771,7 @@ EAPI Evas_Object *
elm_layout_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_layout.h b/src/lib/elm_layout.h
index bd3b746..3c34391 100644
--- a/src/lib/elm_layout.h
+++ b/src/lib/elm_layout.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Layout Layout
+ * @defgroup Elm_Layout Layout
* @ingroup Elementary
*
* @image html layout_inheritance_tree.png
diff --git a/src/lib/elm_layout_common.h b/src/lib/elm_layout_common.h
index 165660c..f4d202e 100644
--- a/src/lib/elm_layout_common.h
+++ b/src/lib/elm_layout_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Layout
+ * @addtogroup Elm_Layout
*
* @{
*/
diff --git a/src/lib/elm_layout_eo.h b/src/lib/elm_layout_eo.h
index 3b0c4e7..993fefc 100644
--- a/src/lib/elm_layout_eo.h
+++ b/src/lib/elm_layout_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Layout
+ * @ingroup Elm_Layout
*
* @{
*/
diff --git a/src/lib/elm_layout_legacy.h b/src/lib/elm_layout_legacy.h
index e5bd857..539152c 100644
--- a/src/lib/elm_layout_legacy.h
+++ b/src/lib/elm_layout_legacy.h
@@ -7,7 +7,7 @@
* @see elm_layout_file_set()
* @see elm_layout_theme_set()
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*/
EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
@@ -20,7 +20,7 @@ EAPI Evas_Object *elm_layout_add(Evas_Object *parent);
*
* @since 1.9
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*/
EAPI Eina_List *elm_layout_content_swallow_list_get(const Evas_Object *obj);
@@ -47,7 +47,7 @@ EAPI Eina_List *elm_layout_content_swallow_list_get(const Evas
*
* @see @ref secBox
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*/
EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
@@ -59,7 +59,7 @@ EAPI Eina_Bool elm_layout_content_set(Evas_Object *obj, const
*
* @return The swallowed object or NULL if none or an error occurred
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*/
EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj, const char *swallow);
@@ -72,7 +72,7 @@ EAPI Evas_Object *elm_layout_content_get(const Evas_Object *obj,
*
* Unparent and return the content object which was set for this part.
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*/
EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, const char *swallow);
@@ -81,7 +81,7 @@ EAPI Evas_Object *elm_layout_content_unset(Evas_Object *obj, con
*
* @return (1 = success, 0 = error)
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*
* @param[in] file The path to file (edj) that will be used as layout
* @param[in] group The group that the layout belongs in edje file
@@ -92,7 +92,7 @@ EAPI Eina_Bool elm_layout_file_set(Eo *obj, const char *file, const char *group)
* Get the loaded file
*
*
- * @ingroup Layout
+ * @ingroup Elm_Layout
*
* @param file The path to file (edj) used as layout
* @param group The group that the layout belongs in edje file
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 225f892..14164dc 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2284,8 +2284,7 @@ _item_new(Evas_Object *obj,
Evas_Smart_Cb func,
const void *data)
{
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_LIST_ITEM_CLASS, obj);
+ Eo *eo_it = eo_add(ELM_LIST_ITEM_CLASS, obj);
if (!eo_it) return NULL;
ELM_LIST_ITEM_DATA_GET(eo_it, it);
@@ -2542,8 +2541,7 @@ EAPI Evas_Object *
elm_list_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h
index a324ad2..b9e9000 100644
--- a/src/lib/elm_list.h
+++ b/src/lib/elm_list.h
@@ -1,5 +1,5 @@
/**
- * @defgroup List List
+ * @defgroup Elm_List List
* @ingroup Elementary
*
* @image html list_inheritance_tree.png
@@ -92,7 +92,7 @@
*/
/**
- * @addtogroup List
+ * @addtogroup Elm_List
* @{
*/
diff --git a/src/lib/elm_list_eo.h b/src/lib/elm_list_eo.h
index f3bf3bc..d243e2b 100644
--- a/src/lib/elm_list_eo.h
+++ b/src/lib/elm_list_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup List
+ * @ingroup Elm_List
*
* @{
*/
diff --git a/src/lib/elm_list_legacy.h b/src/lib/elm_list_legacy.h
index 190a4c6..a99532d 100644
--- a/src/lib/elm_list_legacy.h
+++ b/src/lib/elm_list_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new list widget on the canvas.
*
- * @ingroup List
+ * @ingroup Elm_List
*/
EAPI Evas_Object *elm_list_add(Evas_Object *parent);
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 0bb4c4d..d0bbb7d 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -1523,6 +1523,20 @@ elm_object_focus_move_policy_get(const Evas_Object *obj)
return elm_widget_focus_move_policy_get(obj);
}
+EAPI Eina_Bool
+elm_object_focus_move_policy_automatic_get(const Evas_Object *obj)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
+ return elm_widget_focus_move_policy_automatic_get(obj);
+}
+
+EAPI void
+elm_object_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic)
+{
+ EINA_SAFETY_ON_NULL_RETURN(obj);
+ elm_widget_focus_move_policy_automatic_set(obj, automatic);
+}
+
EAPI void
elm_object_scroll_hold_push(Evas_Object *obj)
{
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index ecc75dc..b4f9152 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -4062,7 +4062,7 @@ _elm_map_evas_object_smart_add(Eo *obj, Elm_Map_Data *priv)
elm_interface_scrollable_animate_stop_cb_set(obj, _scroll_animate_stop_cb);
elm_interface_scrollable_scroll_cb_set(obj, _scroll_cb);
- eo_add(&priv->pan_obj, MY_PAN_CLASS, evas_object_evas_get(obj));
+ priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
eo_data_ref(obj, NULL);
pan_data->wobj = obj;
@@ -4213,8 +4213,7 @@ EAPI Evas_Object *
elm_map_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h
index 8f2bfdc..5026763 100644
--- a/src/lib/elm_map.h
+++ b/src/lib/elm_map.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Map Map
+ * @defgroup Elm_Map Map
* @ingroup Elementary
*
* @image html map_inheritance_tree.png
diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h
index 55fa955..625094a 100644
--- a/src/lib/elm_map_common.h
+++ b/src/lib/elm_map_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Map
+ * @addtogroup Elm_Map
*
* @{
*/
diff --git a/src/lib/elm_map_legacy.h b/src/lib/elm_map_legacy.h
index 6176522..ff0facd 100644
--- a/src/lib/elm_map_legacy.h
+++ b/src/lib/elm_map_legacy.h
@@ -6,7 +6,7 @@
*
* This function inserts a new map widget on the canvas.
*
- * @ingroup Map
+ * @ingroup Elm_Map
*/
EAPI Evas_Object *elm_map_add(Evas_Object *parent);
diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index 2bd01da..b06dd3f 100644
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -286,8 +286,7 @@ EAPI Evas_Object *
elm_mapbuf_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_mapbuf.h b/src/lib/elm_mapbuf.h
index b2ef299..7714cfd 100644
--- a/src/lib/elm_mapbuf.h
+++ b/src/lib/elm_mapbuf.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Mapbuf Mapbuf
+ * @defgroup Elm_Mapbuf Mapbuf
* @ingroup Elementary
*
* @image html mapbuf_inheritance_tree.png
@@ -32,7 +32,7 @@
*/
/**
- * @addtogroup Mapbuf
+ * @addtogroup Elm_Mapbuf
* @{
*/
diff --git a/src/lib/elm_mapbuf_eo.h b/src/lib/elm_mapbuf_eo.h
index 05862c4..dd0c5b8 100644
--- a/src/lib/elm_mapbuf_eo.h
+++ b/src/lib/elm_mapbuf_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Mapbuf
+ * @ingroup Elm_Mapbuf
*
* @{
*/
diff --git a/src/lib/elm_mapbuf_legacy.h b/src/lib/elm_mapbuf_legacy.h
index 6308956..bc56b1d 100644
--- a/src/lib/elm_mapbuf_legacy.h
+++ b/src/lib/elm_mapbuf_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new mapbuf widget on the canvas.
*
- * @ingroup Mapbuf
+ * @ingroup Elm_Mapbuf
*/
EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent);
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index f8d3e4c..ee31bcc 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -781,8 +781,7 @@ EAPI Evas_Object *
elm_menu_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -1021,7 +1020,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
elm_interface_atspi_accessible_type_set(icon_obj, ELM_ATSPI_TYPE_DISABLED);
if (!icon_obj) return NULL;
- eo_add(&eo_item, ELM_MENU_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_MENU_ITEM_CLASS, obj);
if (!eo_item)
{
evas_object_del(icon_obj);
@@ -1109,7 +1108,7 @@ _elm_menu_item_separator_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *eo_p_i
ELM_MENU_ITEM_DATA_GET(eo_subitem, subitem);
if (subitem->separator) return NULL;
- eo_add(&eo_subitem, ELM_MENU_ITEM_CLASS, obj);
+ eo_subitem = eo_add(ELM_MENU_ITEM_CLASS, obj);
if (!eo_subitem) return NULL;
subitem = eo_data_scope_get(eo_subitem, ELM_MENU_ITEM_CLASS);
diff --git a/src/lib/elm_menu.h b/src/lib/elm_menu.h
index cf2eb05..1afb076 100644
--- a/src/lib/elm_menu.h
+++ b/src/lib/elm_menu.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Menu Menu
+ * @defgroup Elm_Menu Menu
* @ingroup Elementary
*
* @image html menu_inheritance_tree.png
diff --git a/src/lib/elm_menu_legacy.h b/src/lib/elm_menu_legacy.h
index a575de8..9c86efc 100644
--- a/src/lib/elm_menu_legacy.h
+++ b/src/lib/elm_menu_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object.
* @return The new object or NULL if it cannot be created.
*
- * @ingroup Menu
+ * @ingroup Elm_Menu
*/
EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
@@ -14,7 +14,7 @@ EAPI Evas_Object *elm_menu_add(Evas_Object *parent);
* @param obj The menu object.
* @param parent The new parent.
*
- * @ingroup Menu
+ * @ingroup Elm_Menu
*/
EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
@@ -26,7 +26,7 @@ EAPI void elm_menu_parent_set(Evas_Object *obj, Evas_Obj
*
* @see elm_menu_parent_set()
*
- * @ingroup Menu
+ * @ingroup Elm_Menu
*/
EAPI Evas_Object *elm_menu_parent_get(const Evas_Object *obj);
diff --git a/src/lib/elm_mirroring.h b/src/lib/elm_mirroring.h
index 815b842..961ef63 100644
--- a/src/lib/elm_mirroring.h
+++ b/src/lib/elm_mirroring.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Mirroring Mirroring
+ * @defgroup Elm_Mirroring Mirroring
* @ingroup Elementary
*
* These functions allow you to set ui-mirroring on specific
@@ -19,7 +19,7 @@
* @param obj The widget.
* @return @c EINA_TRUE if mirrored is set, @c EINA_FALSE otherwise
*
- * @ingroup Mirroring
+ * @ingroup Elm_Mirroring
*/
EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj);
@@ -29,7 +29,7 @@ EAPI Eina_Bool elm_object_mirrored_get(const Evas_Object *obj);
* @param obj The widget.
* @param mirrored @c EINA_TRUE to set mirrored mode, @c EINA_FALSE to unset it.
*
- * @ingroup Mirroring
+ * @ingroup Elm_Mirroring
*/
EAPI void elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
@@ -39,7 +39,7 @@ EAPI void elm_object_mirrored_set(Evas_Object *obj, Eina_Bool mirrored);
* @param obj The widget.
* @return mirrored mode setting of the object.
*
- * @ingroup Mirroring
+ * @ingroup Elm_Mirroring
*/
EAPI Eina_Bool elm_object_mirrored_automatic_get(const Evas_Object *obj);
@@ -51,7 +51,7 @@ EAPI Eina_Bool elm_object_mirrored_automatic_get(const Evas_Object *obj);
* @param automatic @c EINA_TRUE for auto mirrored mode. @c EINA_FALSE for
* manual.
*
- * @ingroup Mirroring
+ * @ingroup Elm_Mirroring
*/
EAPI void elm_object_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic);
diff --git a/src/lib/elm_need.h b/src/lib/elm_need.h
index 6f2e89b..84bba74 100644
--- a/src/lib/elm_need.h
+++ b/src/lib/elm_need.h
@@ -93,7 +93,7 @@ EAPI Eina_Bool elm_need_elocation(void);
* This must be called before any other function that deals with
* elm_thumb objects or ethumb_client instances.
*
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
*/
EAPI Eina_Bool elm_need_ethumb(void);
@@ -105,6 +105,6 @@ EAPI Eina_Bool elm_need_ethumb(void);
* This must be called before any other function that deals with
* elm_web objects or ewk_view instances.
*
- * @ingroup Web
+ * @ingroup Elm_Web
*/
EAPI Eina_Bool elm_need_web(void);
diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 59860d7..4a22425 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -464,8 +464,7 @@ EAPI Evas_Object *
elm_notify_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_notify.h b/src/lib/elm_notify.h
index 170198f..0d4e5da 100644
--- a/src/lib/elm_notify.h
+++ b/src/lib/elm_notify.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Notify Notify
+ * @defgroup Elm_Notify Notify
* @ingroup Elementary
*
* @image html notify_inheritance_tree.png
diff --git a/src/lib/elm_notify_eo.h b/src/lib/elm_notify_eo.h
index cc35dff..e1382c3 100644
--- a/src/lib/elm_notify_eo.h
+++ b/src/lib/elm_notify_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Notify
+ * @ingroup Elm_Notify
*
* @{
*/
diff --git a/src/lib/elm_notify_legacy.h b/src/lib/elm_notify_legacy.h
index fed3b98..e3547d7 100644
--- a/src/lib/elm_notify_legacy.h
+++ b/src/lib/elm_notify_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Notify
+ * @ingroup Elm_Notify
*/
EAPI Evas_Object *elm_notify_add(Evas_Object *parent);
@@ -17,7 +17,7 @@ EAPI Evas_Object *elm_notify_add(Evas_Object *parent);
* Once the parent object is set, a previously set one will be disconnected
* and replaced.
*
- * @ingroup Notify
+ * @ingroup Elm_Notify
*/
EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_Object *parent);
@@ -29,7 +29,7 @@ EAPI void elm_notify_parent_set(Evas_Object *obj, Evas_O
*
* @see elm_notify_parent_set()
*
- * @ingroup Notify
+ * @ingroup Elm_Notify
*/
EAPI Evas_Object *elm_notify_parent_get(const Evas_Object *obj);
diff --git a/src/lib/elm_object.h b/src/lib/elm_object.h
index df066d0..935e6a7 100644
--- a/src/lib/elm_object.h
+++ b/src/lib/elm_object.h
@@ -7,7 +7,7 @@
*
* @note Elementary objects may have many text parts (e.g. Action Slider)
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_part_text_set(Evas_Object *obj, const char *part, const char *text);
@@ -22,7 +22,7 @@ EAPI void elm_object_part_text_set(Evas_Object *obj, con
*
* @note Elementary objects may have many text parts (e.g. Action Slider)
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI const char *elm_object_part_text_get(const Evas_Object *obj, const char *part);
@@ -51,7 +51,7 @@ EAPI const char *elm_object_part_text_get(const Evas_Object *ob
*
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_domain_translatable_part_text_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
@@ -77,7 +77,7 @@ EAPI void elm_object_domain_translatable_part_text_set(Evas_Object *obj, co
*
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI const char *elm_object_translatable_part_text_get(const Evas_Object *obj, const char *part);
@@ -104,7 +104,7 @@ EAPI const char *elm_object_translatable_part_text_get(const Evas_Object *obj, c
*
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_domain_part_text_translatable_set(Evas_Object *obj, const char *part, const char *domain, Eina_Bool translatable);
@@ -130,7 +130,7 @@ EAPI void elm_object_domain_part_text_translatable_set(Evas_Object *obj, const c
*
* @see elm_object_part_content_get()
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content);
@@ -147,7 +147,7 @@ EAPI void elm_object_part_content_set(Evas_Object *obj,
*
* @see elm_object_part_content_set() for more details
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part);
@@ -164,7 +164,7 @@ EAPI Evas_Object *elm_object_part_content_get(const Evas_Object
*
* @see elm_object_part_content_set() for more details
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part);
@@ -176,7 +176,7 @@ EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj
* @param obj The object which is to be described
* @param txt The text that describes the widget to people with poor or no vision
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_access_info_set(Evas_Object *obj, const char *txt);
@@ -186,7 +186,7 @@ EAPI void elm_object_access_info_set(Evas_Object *obj, c
* @param obj The object which is to be described
* @return The text that describes the widget to people with poor or no vision
*
- * @ingroup General
+ * @ingroup Elm_General
*
* @since 1.14
*/
@@ -210,12 +210,12 @@ EAPI const char *elm_object_access_info_get(Evas_Object *obj);
* is unique amongst children. If recurse is set to -1 it will recurse
* without limit.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, const char *name, int recurse);
/**
- * @defgroup Styles Styles
+ * @defgroup Elm_Styles Styles
*
* Widgets can have different styles of look. These generic API's
* set styles of widgets, if they support them (and if the theme(s)
@@ -241,7 +241,7 @@ EAPI Evas_Object *elm_object_name_find(const Evas_Object *obj, c
* @see elm_theme_overlay_add()
* @see elm_theme_overlay_del()
*
- * @ingroup Styles
+ * @ingroup Elm_Styles
*/
EAPI Eina_Bool elm_object_style_set(Evas_Object *obj, const char *style);
@@ -257,7 +257,7 @@ EAPI Eina_Bool elm_object_style_set(Evas_Object *obj, const char *style);
*
* @see elm_object_style_set()
*
- * @ingroup Styles
+ * @ingroup Elm_Styles
*/
EAPI const char *elm_object_style_get(const Evas_Object *obj);
@@ -277,7 +277,7 @@ EAPI const char *elm_object_style_get(const Evas_Object *obj);
* This sets the state for the widget, either disabling it or
* enabling it back.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_disabled_set(Evas_Object *obj, Eina_Bool disabled);
@@ -290,12 +290,12 @@ EAPI void elm_object_disabled_set(Evas_Object *obj, Eina_Bool disabled);
*
* This gets the state of the widget, which might be enabled or disabled.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj);
/**
- * @defgroup WidgetNavigation Widget Tree Navigation
+ * @defgroup Elm_WidgetNavigation Widget Tree Navigation
*
* These functions provide checks for if a Evas_Object is an Elementary widget,
* the possibility of getting a widget's parent, top level parent and getting a
@@ -308,7 +308,7 @@ EAPI Eina_Bool elm_object_disabled_get(const Evas_Object *obj);
* @param obj the object to query.
* @return @c EINA_TRUE if it is an elementary widget variant,
* @c EINA_FALSE otherwise
- * @ingroup WidgetNavigation
+ * @ingroup Elm_WidgetNavigation
*/
EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj);
@@ -328,7 +328,7 @@ EAPI Eina_Bool elm_object_widget_check(const Evas_Object *obj);
* application's window, which is the root of that tree, all other
* objects would have valid Elementary widget parents.
*
- * @ingroup WidgetNavigation
+ * @ingroup Elm_WidgetNavigation
*/
EAPI Evas_Object *elm_object_parent_widget_get(const Evas_Object *obj);
@@ -338,7 +338,7 @@ EAPI Evas_Object *elm_object_parent_widget_get(const Evas_Object *obj);
* @param obj The object to query.
* @return The top level Elementary widget, or @c NULL if parent cannot be
* found.
- * @ingroup WidgetNavigation
+ * @ingroup Elm_WidgetNavigation
*/
EAPI Evas_Object *elm_object_top_widget_get(const Evas_Object *obj);
@@ -347,7 +347,7 @@ EAPI Evas_Object *elm_object_top_widget_get(const Evas_Object *obj);
*
* @param obj the object to query.
* @return Elementary widget name, or @c NULL if not a valid widget.
- * @ingroup WidgetNavigation
+ * @ingroup Elm_WidgetNavigation
*/
EAPI const char *elm_object_widget_type_get(const Evas_Object *obj);
@@ -361,7 +361,7 @@ EAPI const char *elm_object_widget_type_get(const Evas_Object *obj);
* @param obj The object
* @param emission The signal's name.
* @param source The signal's source.
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_signal_emit(Evas_Object *obj, const char *emission, const char *source);
@@ -378,7 +378,7 @@ EAPI void elm_object_signal_emit(Evas_Object *obj, const char *emission,
* @param func The callback function to be executed when the signal is
* emitted.
* @param data A pointer to data to pass to the callback function.
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
@@ -400,7 +400,7 @@ EAPI void elm_object_signal_callback_add(Evas_Object *obj, const char *e
* elm_object_signal_callback_add(). The data pointer that was passed
* to this call will be returned.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
@@ -452,7 +452,7 @@ EAPI void *elm_object_signal_callback_del(Evas_Object *obj, const char *e
*
* @see elm_object_event_callback_del()
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb func, const void *data);
@@ -470,7 +470,7 @@ EAPI void elm_object_event_callback_add(Evas_Object *obj, Elm_Event_Cb f
* emitted.
* @param data Data to pass in to the callback function.
* @return The data pointer
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void *elm_object_event_callback_del(Evas_Object *obj, Elm_Event_Cb func, const void *data);
@@ -490,7 +490,7 @@ EAPI void *elm_object_event_callback_del(Evas_Object *obj, Elm_Event_Cb f
*
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled);
@@ -504,7 +504,7 @@ EAPI void elm_object_orientation_mode_disabled_set(Evas_Object *obj, Eina
*
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI Eina_Bool elm_object_orientation_mode_disabled_get(const Evas_Object *obj);
diff --git a/src/lib/elm_object_item.h b/src/lib/elm_object_item.h
index db19862..8c933a6 100644
--- a/src/lib/elm_object_item.h
+++ b/src/lib/elm_object_item.h
@@ -1,7 +1,7 @@
/**
* @typedef Elm_Object_Item
* An Elementary Object item handle.
- * @ingroup General
+ * @ingroup Elm_General
*/
typedef Eo Elm_Object_Item;
@@ -17,7 +17,7 @@ typedef Eo Elm_Object_Item;
* @see elm_object_item_signal_callback_add()
* @since 1.8
*
- * @ingroup General
+ * @ingroup Elm_General
*/
typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Object_Item *it, const char *emission, const char *source);
@@ -38,7 +38,7 @@ typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Objec
*
* @note Elementary object items may have many labels.
*
- * @ingroup General
+ * @ingroup Elm_General
*/
#define elm_object_item_text_set(it, label) elm_object_item_part_text_set((it), NULL, (label))
@@ -64,7 +64,7 @@ typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Objec
* @return The data associated with @p it
*
* @note Every elm_object_item supports this API
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void *elm_object_item_data_get(const Elm_Object_Item *it);
@@ -74,6 +74,6 @@ EAPI void *elm_object_item_data_get(const Elm_Object_Item *it);
* @param data The data to be associated with @p it
*
* @note Every elm_object_item supports this API
- * @ingroup General
+ * @ingroup Elm_General
*/
EAPI void elm_object_item_data_set(Elm_Object_Item *it, void *data);
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 95a52e4..692649a 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1160,8 +1160,7 @@ EAPI Evas_Object *
elm_panel_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
wd->highlight_root = EINA_TRUE;
diff --git a/src/lib/elm_panel.h b/src/lib/elm_panel.h
index 175fcc1..1a9c5d0 100644
--- a/src/lib/elm_panel.h
+++ b/src/lib/elm_panel.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Panel Panel
+ * @defgroup Elm_Panel Panel
* @ingroup Elementary
*
* @image html panel_inheritance_tree.png
diff --git a/src/lib/elm_panel_common.h b/src/lib/elm_panel_common.h
index 53b77e4..236c83d 100644
--- a/src/lib/elm_panel_common.h
+++ b/src/lib/elm_panel_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Panel
+ * @addtogroup Elm_Panel
*
* @{
*/
diff --git a/src/lib/elm_panel_legacy.h b/src/lib/elm_panel_legacy.h
index dd5d416..33513fc 100644
--- a/src/lib/elm_panel_legacy.h
+++ b/src/lib/elm_panel_legacy.h
@@ -5,7 +5,7 @@
*
* @return The panel object, or NULL on failure
*
- * @ingroup Panel
+ * @ingroup Elm_Panel
*/
EAPI Evas_Object *elm_panel_add(Evas_Object *parent);
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 197a666..2e249e0 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -321,8 +321,7 @@ EAPI Evas_Object *
elm_panes_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_panes.h b/src/lib/elm_panes.h
index 1b3d2c4..af4a70f 100644
--- a/src/lib/elm_panes.h
+++ b/src/lib/elm_panes.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Panes Panes
+ * @defgroup Elm_Panes Panes
* @ingroup Elementary
*
* @image html panes_inheritance_tree.png
@@ -50,7 +50,7 @@
/**
- * @addtogroup Panes
+ * @addtogroup Elm_Panes
* @{
*/
diff --git a/src/lib/elm_panes_legacy.h b/src/lib/elm_panes_legacy.h
index c1c625b..c6c2d38 100644
--- a/src/lib/elm_panes_legacy.h
+++ b/src/lib/elm_panes_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new panes widget on the canvas.
*
- * @ingroup Panes
+ * @ingroup Elm_Panes
*/
EAPI Evas_Object *elm_panes_add(Evas_Object *parent);
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index e1bb05c..c8ffc74 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -296,8 +296,7 @@ EAPI Evas_Object *
elm_photo_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -361,13 +360,13 @@ _elm_photo_fill_inside_get(Eo *obj EINA_UNUSED, Elm_Photo_Data *sd)
}
EOLIAN static void
-_elm_photo_editable_set(Eo *obj EINA_UNUSED, Elm_Photo_Data *sd, Eina_Bool set)
+_elm_photo_evas_draggable_interface_drag_target_set(Eo *obj EINA_UNUSED, Elm_Photo_Data *sd, Eina_Bool set)
{
elm_image_editable_set(sd->icon, set);
}
EOLIAN static Eina_Bool
-_elm_photo_editable_get(Eo *obj EINA_UNUSED, Elm_Photo_Data *sd)
+_elm_photo_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Photo_Data *sd)
{
return elm_image_editable_get(sd->icon);
}
@@ -405,4 +404,17 @@ elm_photo_file_set(Eo *obj, const char *file)
return efl_file_set((Eo *) obj, file, NULL);
}
+/* Legacy deprecated functions */
+EAPI void
+elm_photo_editable_set(Evas_Object *obj, Eina_Bool edit)
+{
+ evas_draggable_interface_drag_target_set(obj, edit);
+}
+
+EAPI Eina_Bool
+elm_photo_editable_get(const Evas_Object *obj)
+{
+ return evas_draggable_interface_drag_target_get(obj);
+}
+
#include "elm_photo.eo.c"
diff --git a/src/lib/elm_photo.eo b/src/lib/elm_photo.eo
index 6a6c2f8..68c1fae 100644
--- a/src/lib/elm_photo.eo
+++ b/src/lib/elm_photo.eo
@@ -2,22 +2,6 @@ class Elm.Photo (Elm.Widget, Efl.File, Evas.Clickable_Interface, Evas.Draggable_
{
eo_prefix: elm_obj_photo;
methods {
- @property editable {
- set {
- [[Set editability of the photo.
-
- An editable photo can be dragged to or from, and can be cut or
- pasted too. Note that pasting an image or dropping an item on
- the image will delete the existing content.
- ]]
- }
- get {
- [[Get editability of the photo.]]
- }
- values {
- set: bool; [[To set of clear editability.]]
- }
- }
@property fill_inside {
set {
[[Set if the photo should be completely visible or not.]]
@@ -77,6 +61,8 @@ class Elm.Photo (Elm.Widget, Efl.File, Evas.Clickable_Interface, Evas.Draggable_
Efl.File.file.set;
Evas.Object_Smart.add;
Evas.Object_Smart.del;
+ Evas.Draggable_Interface.drag_target.set;
+ Evas.Draggable_Interface.drag_target.get;
Elm.Widget.theme_apply;
}
diff --git a/src/lib/elm_photo.h b/src/lib/elm_photo.h
index db928f0..60a8806 100644
--- a/src/lib/elm_photo.h
+++ b/src/lib/elm_photo.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Photo Photo
+ * @defgroup Elm_Photo Photo
* @ingroup Elementary
*
* @image html photo_inheritance_tree.png
diff --git a/src/lib/elm_photo_eo.h b/src/lib/elm_photo_eo.h
index 5607977..f89beb7 100644
--- a/src/lib/elm_photo_eo.h
+++ b/src/lib/elm_photo_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Photo
+ * @ingroup Elm_Photo
*
* @{
*/
diff --git a/src/lib/elm_photo_legacy.h b/src/lib/elm_photo_legacy.h
index 8534268..116c0be 100644
--- a/src/lib/elm_photo_legacy.h
+++ b/src/lib/elm_photo_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Photo
+ * @ingroup Elm_Photo
*/
EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
@@ -17,10 +17,31 @@ EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
* @note Use @c NULL on @a file to set the photo widget back to it's
* initial state, which indicates "no photo".
*
- * @ingroup Photo
+ * @ingroup Elm_Photo
*
* @param[in] file The path to file that will be used as @a obj's image.
*/
EAPI Eina_Bool elm_photo_file_set(Eo *obj, const char *file);
+/**
+ * Set editability of the photo.
+ *
+ * An editable photo can be dragged to or from, and can be cut or pasted too.
+ * Note that pasting an image or dropping an item on the image will delete the
+ * existing content.
+ *
+ * @param[in] set To set of clear editability.
+ *
+ * @ingroup Elm_Photo
+ */
+EAPI void elm_photo_editable_set(Evas_Object *obj, Eina_Bool set);
+
+/**
+ * Get editability of the photo.
+ *
+ * @return To set of clear editability.
+ *
+ * @ingroup Elm_Photo
+ */
+EAPI Eina_Bool elm_photo_editable_get(const Evas_Object *obj);
#include "elm_photo.eo.legacy.h"
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index bf99468..31acf63 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -1414,7 +1414,7 @@ _elm_photocam_evas_object_smart_add(Eo *obj, Elm_Photocam_Data *priv)
elm_interface_scrollable_bounce_allow_set(obj, bounce, bounce);
- eo_add(&priv->pan_obj, MY_PAN_CLASS, evas_object_evas_get(obj));
+ priv->pan_obj = eo_add(MY_PAN_CLASS, evas_object_evas_get(obj));
pan_data = eo_data_scope_get(priv->pan_obj, MY_PAN_CLASS);
eo_data_ref(obj, NULL);
pan_data->wobj = obj;
@@ -1506,8 +1506,7 @@ EAPI Evas_Object *
elm_photocam_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_photocam.h b/src/lib/elm_photocam.h
index c3b5b82..74cd16d 100644
--- a/src/lib/elm_photocam.h
+++ b/src/lib/elm_photocam.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Photocam Photocam
+ * @defgroup Elm_Photocam Photocam
* @ingroup Elementary
*
* @image html photocam_inheritance_tree.png
diff --git a/src/lib/elm_photocam_legacy.h b/src/lib/elm_photocam_legacy.h
index c4c206e..c7e720c 100644
--- a/src/lib/elm_photocam_legacy.h
+++ b/src/lib/elm_photocam_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*/
EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
@@ -19,7 +19,7 @@ EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
*
* This shows the region of the image using animation.
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*/
EAPI void elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
@@ -36,7 +36,7 @@ EAPI void elm_photocam_image_region_bring_in(Evas_Object *obj,
* photo that at some time in the future will be displayed at the full
* quality needed.
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*
* @param[in] file The photo file
*/
@@ -50,7 +50,7 @@ EAPI Evas_Load_Error elm_photocam_file_set(Evas_Object *obj, const char *file);
*
* @see elm_photocam_file_set()
*
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
*
*/
EAPI const char *elm_photocam_file_get(const Evas_Object *obj);
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index ca435bb..a567d63 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -136,8 +136,7 @@ EAPI Evas_Object *
elm_plug_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c
index 7f50f37..87e12e0 100644
--- a/src/lib/elm_prefs.c
+++ b/src/lib/elm_prefs.c
@@ -508,8 +508,7 @@ elm_prefs_add(Evas_Object *parent)
return NULL;
}
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_prefs.h b/src/lib/elm_prefs.h
index fa9a827..66a049a 100644
--- a/src/lib/elm_prefs.h
+++ b/src/lib/elm_prefs.h
@@ -2,7 +2,7 @@
#define ELM_PREFS_H
/**
- * @addtogroup Prefs
+ * @addtogroup Elm_Prefs
* @{
*
* @section elm-prefs-widget Prefs
diff --git a/src/lib/elm_prefs_common.h b/src/lib/elm_prefs_common.h
index 17cd0fb..cf73452 100644
--- a/src/lib/elm_prefs_common.h
+++ b/src/lib/elm_prefs_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Prefs
+ * @addtogroup Elm_Prefs
*
* @{
*/
diff --git a/src/lib/elm_prefs_eo.h b/src/lib/elm_prefs_eo.h
index c3e1612..657fbd3 100644
--- a/src/lib/elm_prefs_eo.h
+++ b/src/lib/elm_prefs_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Prefs
+ * @ingroup Elm_Prefs
*
* @{
*/
diff --git a/src/lib/elm_prefs_legacy.h b/src/lib/elm_prefs_legacy.h
index 5c9dd91..9670523 100644
--- a/src/lib/elm_prefs_legacy.h
+++ b/src/lib/elm_prefs_legacy.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Prefs
+ * @ingroup Elm_Prefs
*
* @{
*/
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 91b4285..f8a5786 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -386,6 +386,7 @@ void _elm_win_rescale(Elm_Theme *th,
Eina_Bool use_theme);
void _elm_win_access(Eina_Bool is_access);
void _elm_win_translate(void);
+void _elm_win_focus_reconfigure(void);
Ecore_X_Window _elm_ee_xwin_get(const Ecore_Evas *ee);
diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 7860f26..a001fac 100644
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -324,8 +324,7 @@ EAPI Evas_Object *
elm_progressbar_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_progressbar.h b/src/lib/elm_progressbar.h
index cbb1516..12cd9b3 100644
--- a/src/lib/elm_progressbar.h
+++ b/src/lib/elm_progressbar.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Progressbar Progress bar
+ * @defgroup Elm_Progressbar Progress bar
* @ingroup Elementary
*
* @image html progressbar_inheritance_tree.png
diff --git a/src/lib/elm_progressbar_common.h b/src/lib/elm_progressbar_common.h
index a4704de..76f48a8 100644
--- a/src/lib/elm_progressbar_common.h
+++ b/src/lib/elm_progressbar_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Progressbar
+ * @addtogroup Elm_Progressbar
*
* @{
*/
diff --git a/src/lib/elm_progressbar_legacy.h b/src/lib/elm_progressbar_legacy.h
index ea405de..5979734 100644
--- a/src/lib/elm_progressbar_legacy.h
+++ b/src/lib/elm_progressbar_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new progress bar widget on the canvas.
*
- * @ingroup Progressbar
+ * @ingroup Elm_Progressbar
*/
EAPI Evas_Object *elm_progressbar_add(Evas_Object *parent);
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 923f1b9..39576cf 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -267,8 +267,7 @@ EAPI Evas_Object *
elm_radio_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_radio.h b/src/lib/elm_radio.h
index eeeb14b..be1fad2 100644
--- a/src/lib/elm_radio.h
+++ b/src/lib/elm_radio.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Radio Radio
+ * @defgroup Elm_Radio Radio
* @ingroup Elementary
*
* @image html radio_inheritance_tree.png
diff --git a/src/lib/elm_radio_legacy.h b/src/lib/elm_radio_legacy.h
index 43b3de6..f4ad3b8 100644
--- a/src/lib/elm_radio_legacy.h
+++ b/src/lib/elm_radio_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Radio
+ * @ingroup Elm_Radio
*/
EAPI Evas_Object *elm_radio_add(Evas_Object *parent);
diff --git a/src/lib/elm_removed.h b/src/lib/elm_removed.h
index 8bff73d..e416cc4 100644
--- a/src/lib/elm_removed.h
+++ b/src/lib/elm_removed.h
@@ -190,7 +190,7 @@ EINA_DEPRECATED EAPI const char *elm_engine_current_get(void);
* applications on the display
*
* @param size The finger size
- * @ingroup Fingers
+ * @ingroup Elm_Fingers
* @deprecated Use elm_config_finger_size_set() and elm_config_all_flush()
*/
EINA_DEPRECATED EAPI void elm_finger_size_all_set(Evas_Coord size);
@@ -201,7 +201,7 @@ EINA_DEPRECATED EAPI void elm_finger_size_all_set(Evas_Coord size);
* This sets the globally configured scaling factor that is applied to all
* objects for all applications.
* @param scale The scaling factor to set
- * @ingroup Scaling
+ * @ingroup Elm_Scaling
* @deprecated use elm_scale_set() and elm_config_all_flush()
*/
EINA_DEPRECATED EAPI void elm_scale_all_set(double scale);
@@ -210,7 +210,7 @@ EINA_DEPRECATED EAPI void elm_scale_all_set(double scale);
* Apply the changes made with elm_font_overlay_set() and
* elm_font_overlay_unset() on all Elementary application windows.
*
- * @ingroup Fonts
+ * @ingroup Elm_Fonts
*
* This applies all font overlays set to all objects in the UI.
* @deprecated Use elm_font_overlay_apply and elm_config_all_flush()
@@ -226,7 +226,7 @@ EINA_DEPRECATED EAPI void elm_font_overlay_all_apply(void);
*
* @param size The cache flush interval time
* @deprecated Use elm_cache_flush_interval_set() and elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_cache_flush_interval_all_set(int size);
@@ -239,7 +239,7 @@ EINA_DEPRECATED EAPI void elm_cache_flush_interval_all_set(int size);
*
* @param enabled The cache flush enabled state
* @deprecated Use elm_cache_flush_enabled_set adnd elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_cache_flush_enabled_all_set(Eina_Bool enabled);
@@ -252,7 +252,7 @@ EINA_DEPRECATED EAPI void elm_cache_flush_enabled_all_set(Eina_Bool enabled
*
* @param size The font cache size
* @deprecated Use elm_font_cache_set() and elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_font_cache_all_set(int size);
@@ -265,7 +265,7 @@ EINA_DEPRECATED EAPI void elm_font_cache_all_set(int size);
*
* @param size The image cache size
* @deprecated Use elm_image_cache_set() and elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_image_cache_all_set(int size);
@@ -278,7 +278,7 @@ EINA_DEPRECATED EAPI void elm_image_cache_all_set(int size);
*
* @param size The edje file cache size
* @deprecated Use elm_edje_file_cache_set() and elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_edje_file_cache_all_set(int size);
@@ -291,7 +291,7 @@ EINA_DEPRECATED EAPI void elm_edje_file_cache_all_set(int size);
*
* @param size The edje collections cache size
* @deprecated Use elm_edje_collection_cache_set() and elm_config_all_flush()
- * @ingroup Caches
+ * @ingroup Elm_Caches
*/
EINA_DEPRECATED EAPI void elm_edje_collection_cache_all_set(int size);
@@ -303,7 +303,7 @@ EINA_DEPRECATED EAPI void elm_edje_collection_cache_all_set(int size);
*
* @param profile The profile's name
* @deprecated Use elm_profile_set() and elm_config_all_flush()
- * @ingroup Profile
+ * @ingroup Elm_Profile
*
*/
EINA_DEPRECATED EAPI void elm_profile_all_set(const char *profile);
@@ -317,7 +317,7 @@ EINA_DEPRECATED EAPI void elm_profile_all_set(const char *profile);
*
* @see elm_thumbscroll_bounce_enabled_get()
* @deprecated Use elm_scroll_bounce_enabled_set() and elm_config_all_flush()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_bounce_enabled_all_set(Eina_Bool enabled);
@@ -329,7 +329,7 @@ EINA_DEPRECATED EAPI void elm_scroll_bounce_enabled_all_set(Eina_Bool en
*
* @see elm_thumbscroll_bounce_friction_get()
* @deprecated Use elm_scroll_bounce_friction_set() and elm_config_all_flush()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_bounce_friction_all_set(double friction);
@@ -342,7 +342,7 @@ EINA_DEPRECATED EAPI void elm_scroll_bounce_friction_all_set(double fric
* @see elm_thumbscroll_page_scroll_friction_get()
* @deprecated Use elm_scroll_page_scroll_friction_set() and
* elm_config_all_flush()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_page_scroll_friction_all_set(double friction);
@@ -355,7 +355,7 @@ EINA_DEPRECATED EAPI void elm_scroll_page_scroll_friction_all_set(double
* @see elm_thumbscroll_bring_in_scroll_friction_get()
* @deprecated Use elm_scroll_bring_in_scroll_friction_set() and
* elm_config_all_flush()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_bring_in_scroll_friction_all_set(double friction);
@@ -368,7 +368,7 @@ EINA_DEPRECATED EAPI void elm_scroll_bring_in_scroll_friction_all_set(do
*
* @see elm_thumbscroll_zoom_friction_get()
* @deprecated Use elm_scroll_zoom_friction_set() and elm_config_all_flush()
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_zoom_friction_all_set(double friction);
@@ -382,7 +382,7 @@ EINA_DEPRECATED EAPI void elm_scroll_zoom_friction_all_set(double fricti
* @deprecated Use elm_scroll_thumbscroll_enabled_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_enabled_all_set(Eina_Bool enabled);
@@ -398,7 +398,7 @@ EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_enabled_all_set(Eina_Bo
* @deprecated Use elm_scroll_thumbscroll_threshold_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_threshold_all_set(unsigned int threshold);
@@ -413,7 +413,7 @@ EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_threshold_all_set(unsig
* @deprecated Use elm_scroll_thumbscroll_momentum_threshold_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_momentum_threshold_all_set(double threshold);
@@ -427,7 +427,7 @@ EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_momentum_threshold_all_
* @deprecated Use elm_scroll_thumbscroll_friction_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_friction_all_set(double friction);
@@ -445,7 +445,7 @@ EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_friction_all_set(double
* @deprecated Use elm_scroll_thumbscroll_border_friction_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_border_friction_all_set(double friction);
@@ -462,7 +462,7 @@ EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_border_friction_all_set
* @deprecated Use elm_scroll_thumbscroll_sensitivity_friction_set()
* and elm_config_all_flush()
*
- * @ingroup Scrolling
+ * @ingroup Elm_Scrolling
*/
EINA_DEPRECATED EAPI void elm_scroll_thumbscroll_sensitivity_friction_all_set(double friction);
@@ -558,7 +558,7 @@ EINA_DEPRECATED EAPI const char *elm_anchorview_text_get(const Evas_Object *obj)
* @see elm_ctxpopup_item_disabled_set()
* @deprecated use elm_object_item_disabled_get() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI Eina_Bool elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it);
@@ -571,7 +571,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_ctxpopup_item_disabled_get
* When disabled the item is greyed out to indicate it's state.
* @deprecated use elm_object_item_disabled_set() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI void elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
@@ -587,7 +587,7 @@ EINA_DEPRECATED EAPI void elm_ctxpopup_item_disabled_set(Elm_Object_Item
*
* @deprecated use elm_object_item_part_content_get() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it);
@@ -605,7 +605,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_It
*
* @deprecated use elm_object_item_part_content_set() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon);
@@ -621,7 +621,7 @@ EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it
*
* @deprecated use elm_object_item_text_get() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_Item *it);
@@ -633,7 +633,7 @@ EINA_DEPRECATED EAPI const char *elm_ctxpopup_item_label_get(const Elm_Object_I
*
* @deprecated use elm_object_item_text_set() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label);
@@ -652,7 +652,7 @@ EINA_DEPRECATED EAPI void elm_ctxpopup_item_label_set(Elm_Object_Item *i
*
* @deprecated use elm_object_content_set() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI void elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content);
@@ -670,7 +670,7 @@ EINA_DEPRECATED EAPI void elm_ctxpopup_content_set(Evas_Object *obj, Eva
*
* @deprecated use elm_object_content_unset() instead
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj);
@@ -682,7 +682,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj);
* @deprecated Use elm_object_item_del() instead
* @see elm_ctxpopup_item_append()
*
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
*/
EINA_DEPRECATED EAPI void elm_ctxpopup_item_del(Elm_Object_Item *it);
@@ -1048,7 +1048,7 @@ EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Objec
*
* @deprecated use elm_object_part_content_set() instead
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay);
@@ -1063,7 +1063,7 @@ EINA_DEPRECATED EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Obje
*
* @deprecated use elm_object_part_content_get() instead
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj);
@@ -1077,7 +1077,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj);
*
* @deprecated use elm_object_part_content_unset() instead
*
- * @ingroup Bg
+ * @ingroup Elm_Bg
*/
EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_unset(Evas_Object *obj);
@@ -1298,7 +1298,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj);
*
* @see elm_calendar_mark_add()
*
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
*/
EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos);
@@ -1318,7 +1318,7 @@ EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj,
*
* @see elm_calendar_mark_add()
*
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
*/
EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, int pos);
@@ -1347,7 +1347,7 @@ EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, i
*
* @see elm_calendar_mark_add()
*
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
*/
EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos);
@@ -1494,7 +1494,7 @@ EINA_DEPRECATED EAPI void elm_check_states_labels_get(const Evas_Object
*
* @deprecated use elm_object_content_set() instead
*
- * @ingroup Conformant
+ * @ingroup Elm_Conformant
*/
EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content);
@@ -1513,7 +1513,7 @@ EINA_DEPRECATED EAPI void elm_conformant_content_set(Evas_Object *obj, E
*
* @deprecated use elm_object_content_get() instead
*
- * @ingroup Conformant
+ * @ingroup Elm_Conformant
*/
EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj);
@@ -1529,7 +1529,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *
*
* @deprecated use elm_object_content_unset() instead
*
- * @ingroup Conformant
+ * @ingroup Elm_Conformant
*/
EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj);
@@ -1542,7 +1542,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj)
* @return The max length defined for side labels, or 0 if not a valid
* diskselector.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI int elm_diskselector_side_label_lenght_get(const Evas_Object *obj);
@@ -1554,7 +1554,7 @@ EINA_DEPRECATED EAPI int elm_diskselector_side_label_lenght_get(const Evas_Ob
* @param obj The diskselector object.
* @param len The max length defined for side labels.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *obj, int len);
@@ -1571,7 +1571,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_side_label_lenght_set(Evas_Object *
* @see elm_diskselector_item_append()
* @deprecated Use elm_object_item_data_get()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void *elm_diskselector_item_data_get(const Elm_Object_Item *it);
@@ -1597,7 +1597,7 @@ EINA_DEPRECATED EAPI void *elm_diskselector_item_data_get(const
* @see elm_diskselector_item_icon_get()
*
* @deprecated Use elm_object_item_part_content_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_icon_set(Elm_Object_Item *it, Evas_Object *icon);
@@ -1616,7 +1616,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_icon_set(Elm_O
* @see elm_diskselector_item_icon_set()
*
* @deprecated Use elm_object_item_part_content_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Object_Item *it);
@@ -1652,7 +1652,7 @@ EAPI Evas_Object *elm_diskselector_item_icon_get(const Elm_Object_Item
* @see elm_diskselector_item_append()
*
* @deprecated Use elm_object_item_text_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_label_set(Elm_Object_Item *it, const char *label);
@@ -1671,7 +1671,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_label_set(Elm_
* @see elm_diskselector_item_append()
* @deprecated Use elm_object_item_text_get() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI const char *elm_diskselector_item_label_get(const Elm_Object_Item *it);
@@ -1691,7 +1691,7 @@ EINA_DEPRECATED EAPI const char *elm_diskselector_item_label_get(cons
* freed.
* @deprecated Use elm_object_item_del_cb_set() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func);
@@ -1707,7 +1707,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_del_cb_set(Elm
* @see elm_diskselector_clear()
* @see elm_diskselector_item_append()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_del(Elm_Object_Item *it);
@@ -1723,7 +1723,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_del(Elm_Object
* @deprecated Use elm_object_item_tooltip_text_set() instead
* @see elm_object_tooltip_text_set() for more details.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
@@ -1748,7 +1748,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_text_s
* @deprecated Use elm_object_item_tooltip_content_cb_set() instead
* @see elm_object_tooltip_content_cb_set() for more details.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_content_cb_set(Elm_Object_Item *it, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
@@ -1765,7 +1765,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_conten
* @see elm_object_tooltip_unset() for more details.
* @see elm_diskselector_item_tooltip_content_cb_set()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_unset(Elm_Object_Item *it);
@@ -1782,7 +1782,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_unset(
* @deprecated Use elm_object_item_tooltip_style_set() instead
* @see elm_object_tooltip_style_set() for more details.
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
@@ -1797,7 +1797,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_tooltip_style_
* @see elm_object_tooltip_style_get() for more details.
* @see elm_diskselector_item_tooltip_style_set()
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI const char *elm_diskselector_item_tooltip_style_get(const Elm_Object_Item *it);
@@ -1810,7 +1810,7 @@ EINA_DEPRECATED EAPI const char *elm_diskselector_item_tooltip_style_
* @see elm_object_cursor_set() for more details.
* @deprecated Use elm_object_item_cursor_set() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_set(Elm_Object_Item *it, const char *cursor);
@@ -1824,7 +1824,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_set(Elm
* @see elm_diskselector_item_cursor_set()
* @deprecated Use elm_object_item_cursor_get() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI const char *elm_diskselector_item_cursor_get(const Elm_Object_Item *it);
@@ -1837,7 +1837,7 @@ EINA_DEPRECATED EAPI const char *elm_diskselector_item_cursor_get(con
* @see elm_diskselector_item_cursor_set()
* @deprecated use elm_object_item_cursor_unset() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_unset(Elm_Object_Item *it);
@@ -1853,7 +1853,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_unset(E
* @see elm_object_cursor_style_set() for more details.
* @deprecated Use elm_object_item_cursor_style_set() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_style_set(Elm_Object_Item *it, const char *style);
@@ -1868,7 +1868,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_style_s
* @see elm_diskselector_item_cursor_style_set()
* @deprecated Use elm_object_item_cursor_style_get() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI const char *elm_diskselector_item_cursor_style_get(const Elm_Object_Item *it);
@@ -1888,7 +1888,7 @@ EINA_DEPRECATED EAPI const char *elm_diskselector_item_cursor_style_g
*
* @deprecated Use elm_object_item_cursor_engine_only_set() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool engine_only);
@@ -1903,7 +1903,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_item_cursor_engine_
* @see elm_diskselector_item_cursor_engine_only_set()
* @deprecated Use elm_object_item_cursor_engine_only_get() instead
*
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
*/
EINA_DEPRECATED EAPI Eina_Bool elm_diskselector_item_cursor_engine_only_get(const Elm_Object_Item *it);
@@ -1919,7 +1919,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_factory_content_get(const Evas_Object *obj
* @see elm_object_item_text_set()
*
* @deprecated see elm_object_item_text_get() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Object_Item *it);
@@ -1932,7 +1932,7 @@ EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const Elm_Objec
* @see elm_object_item_text_get()
*
* @deprecated see elm_object_item_text_set() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label);
@@ -1942,7 +1942,7 @@ EINA_DEPRECATED EAPI void elm_flipselector_item_label_set(Elm_Object_Item
* @param it The item to delete
*
* @deprecated Use elm_object_item_del() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EINA_DEPRECATED EAPI void elm_flipselector_item_del(Elm_Object_Item *it);
@@ -1971,7 +1971,7 @@ EINA_DEPRECATED EAPI void elm_flipselector_item_del(Elm_Object_Item *it);
* @see elm_flipselector_interval_get()
* @deprecated Use elm_flipselector_first_interval_set()
*
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EINA_DEPRECATED EAPI void elm_flipselector_interval_set(Evas_Object *obj, double interval);
@@ -1985,7 +1985,7 @@ EINA_DEPRECATED EAPI void elm_flipselector_interval_set(E
* @see elm_flipselector_interval_set() for more details
* @deprecated Use elm_flipselector_first_interval_get()
*
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
*/
EINA_DEPRECATED EAPI double elm_flipselector_interval_get(const Evas_Object *obj);
@@ -2001,7 +2001,7 @@ EINA_DEPRECATED EAPI double elm_flipselector_interval_get(c
* @see elm_object_focus_get()
* @deprecated use elm_object_focus_set() instead.
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj);
@@ -2017,7 +2017,7 @@ EINA_DEPRECATED EAPI void elm_object_focus(Evas_Object *obj);
*
* @deprecated Use elm_object_focus_next() instead
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir);
@@ -2032,7 +2032,7 @@ EINA_DEPRECATED EAPI void elm_object_focus_cycle(Evas_Object *ob
* @see elm_object_focus() and elm_object_focus_custom_chain_get()
* @deprecated use elm_object_focus_set() instead.
*
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EINA_DEPRECATED EAPI void elm_object_unfocus(Evas_Object *obj);
@@ -2047,7 +2047,7 @@ EINA_DEPRECATED EAPI void elm_object_unfocus(Evas_Object *obj);
* @param y Vertical component of direction to focus
*
* @deprecated Support it later.
- * @ingroup Focus
+ * @ingroup Elm_Focus
*/
EINA_DEPRECATED EAPI void elm_object_focus_direction_go(Evas_Object *obj, int x, int y);
@@ -2130,7 +2130,7 @@ EINA_DEPRECATED EAPI void elm_genlist_item_icons_orphan(Elm_Object_Item
* @see elm_genlist_horizontal_get()
*
* @deprecated use elm_genlist_mode_set()
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_horizontal_set(Evas_Object *obj, Elm_List_Mode mode);
@@ -2144,7 +2144,7 @@ EINA_DEPRECATED EAPI void elm_genlist_horizontal_set(Ev
* @see elm_genlist_horizontal_set()
*
* @deprecated use elm_genlist_mode_get()
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_get(const Evas_Object *obj);
@@ -2161,7 +2161,7 @@ EINA_DEPRECATED EAPI Elm_List_Mode elm_genlist_horizontal_get(co
* @see elm_genlist_item_data_set()
*
* @deprecated Use elm_object_item_data_get() instead
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void *elm_genlist_item_data_get(const Elm_Object_Item *it);
@@ -2180,7 +2180,7 @@ EINA_DEPRECATED EAPI void *elm_genlist_item_data_get(con
* @see elm_genlist_item_data_get()
*
* @deprecated Use elm_object_item_data_set() instead
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_item_data_set(Elm_Object_Item *it, const void *data);
@@ -2197,7 +2197,7 @@ EINA_DEPRECATED EAPI void elm_genlist_item_data_set(Elm
* @see elm_genlist_item_disabled_get()
* @deprecated Use elm_object_item_disabled_set() instead
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
@@ -2211,7 +2211,7 @@ EINA_DEPRECATED EAPI void elm_genlist_item_disabled_set
* @see elm_genlist_item_disabled_set() for more details
* @deprecated Use elm_object_item_disabled_get() instead
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI Eina_Bool elm_genlist_item_disabled_get(const Elm_Object_Item *it);
@@ -2225,7 +2225,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_genlist_item_disabled_get
* once.
*
* @deprecated Use elm_object_item_del() instead
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_item_del(Elm_Object_Item *it);
@@ -2239,7 +2239,7 @@ EINA_DEPRECATED EAPI void elm_genlist_item_del(Elm_Obje
* This returns the genlist object itself that an item belongs to.
* @deprecated Use elm_object_item_widget_get() instead
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(const Elm_Object_Item *it);
@@ -2253,7 +2253,7 @@ EINA_DEPRECATED EAPI Evas_Object *elm_genlist_item_genlist_get(
* @c NULL if you don't plan to use Genlist mode. See
* elm_genlist_item_mode_set() for more info.
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI const char *elm_genlist_mode_item_style_get(const Evas_Object *obj);
@@ -2267,7 +2267,7 @@ EINA_DEPRECATED EAPI const char *elm_genlist_mode_item_style_g
* @c NULL if you don't plan to use Genlist mode. See
* elm_genlist_item_mode_set() for more info.
*
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI void elm_genlist_mode_item_style_set(Evas_Object *obj, const char *style);
@@ -2281,7 +2281,7 @@ EINA_DEPRECATED EAPI void elm_genlist_mode_item_style_s
* If it failed, return value is ELM_GENLIST_ITEM_MAX
*
* @deprecated Use elm_genlist_item_type_get() instead
- * @ingroup Genlist
+ * @ingroup Elm_Genlist
*/
EINA_DEPRECATED EAPI Elm_Genlist_Item_Type elm_genlist_item_flags_get(const Elm_Object_Item *it);
@@ -5910,7 +5910,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_side_label_length_s
*
* @see elm_toolbar_always_select_mode_get().
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EINA_DEPRECATED EAPI void elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
@@ -5923,7 +5923,7 @@ EINA_DEPRECATED EAPI void elm_toolbar_always_select_mode
*
* @see elm_toolbar_always_select_mode_set() for details.
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_always_select_mode_get(const Evas_Object *obj);
@@ -5942,7 +5942,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_always_select_mode
*
* @see elm_toolbar_no_select_mode_get().
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EINA_DEPRECATED EAPI void elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
@@ -5955,7 +5955,7 @@ EINA_DEPRECATED EAPI void elm_toolbar_no_select_mode_set
*
* @see elm_toolbar_no_select_mode_set() for details.
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EINA_DEPRECATED EAPI Eina_Bool elm_toolbar_no_select_mode_get(const Evas_Object *obj);
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index e9989b7..80d714c 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -172,14 +172,13 @@ _elm_route_evas_object_smart_del(Eo *obj, Elm_Route_Data *_pd EINA_UNUSED)
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Route
+ * @ingroup Elm_Route
*/
EAPI Evas_Object *
elm_route_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_route.h b/src/lib/elm_route.h
index 80ba517..74a4cb0 100644
--- a/src/lib/elm_route.h
+++ b/src/lib/elm_route.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Route Route
+ * @defgroup Elm_Route Route
* @ingroup Elementary
*
* @image html route_inheritance_tree.png
diff --git a/src/lib/elm_route_legacy.h b/src/lib/elm_route_legacy.h
index b1cdd28..ad320dc 100644
--- a/src/lib/elm_route_legacy.h
+++ b/src/lib/elm_route_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Route
+ * @ingroup Elm_Route
*/
EAPI Evas_Object *elm_route_add(Evas_Object *parent);
diff --git a/src/lib/elm_scale.h b/src/lib/elm_scale.h
index 4332e73..1d03da1 100644
--- a/src/lib/elm_scale.h
+++ b/src/lib/elm_scale.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Scaling Widget Scaling
+ * @defgroup Elm_Scaling Widget Scaling
* @ingroup Elementary
*
* Different widgets can be scaled independently. These functions
@@ -21,7 +21,7 @@
* @param scale Scale factor (from @c 0.0 up, with @c 1.0 meaning
* no scaling)
*
- * @ingroup Scaling
+ * @ingroup Elm_Scaling
*/
EAPI void elm_object_scale_set(Evas_Object *obj, double scale);
@@ -31,6 +31,6 @@ EAPI void elm_object_scale_set(Evas_Object *obj, double scale);
* @param obj The object
* @return The scaling factor set by elm_object_scale_set()
*
- * @ingroup Scaling
+ * @ingroup Elm_Scaling
*/
EAPI double elm_object_scale_get(const Evas_Object *obj);
diff --git a/src/lib/elm_scroll.h b/src/lib/elm_scroll.h
index feb541c..88419e6 100644
--- a/src/lib/elm_scroll.h
+++ b/src/lib/elm_scroll.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Scrollhints Scrollhints
+ * @defgroup Elm_Scrollhints Scrollhints
* @ingroup Elementary
*
* Objects when inside a scroller can scroll, but this may not always be
@@ -26,7 +26,7 @@
* take effect on the parents of the indicated object.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_hold_push(Evas_Object *obj);
@@ -37,7 +37,7 @@ EAPI void elm_object_scroll_hold_push(Evas_Object *obj);
* take effect on the parents of the indicated object.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_hold_pop(Evas_Object *obj);
@@ -49,7 +49,7 @@ EAPI void elm_object_scroll_hold_pop(Evas_Object *obj);
* @param obj The object
* @return The scroll hold count
* @since 1.7
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI int elm_object_scroll_hold_get(const Evas_Object *obj);
@@ -61,7 +61,7 @@ EAPI int elm_object_scroll_hold_get(const Evas_Object *obj);
* object.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_freeze_push(Evas_Object *obj);
@@ -73,7 +73,7 @@ EAPI void elm_object_scroll_freeze_push(Evas_Object *obj);
* object.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_freeze_pop(Evas_Object *obj);
@@ -85,7 +85,7 @@ EAPI void elm_object_scroll_freeze_pop(Evas_Object *obj);
* @param obj The object
* @return The scroll freeze count
* @since 1.7
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI int elm_object_scroll_freeze_get(const Evas_Object *obj);
@@ -97,7 +97,7 @@ EAPI int elm_object_scroll_freeze_get(const Evas_Object *obj);
*
* @param obj The object
* @param lock The lock state (1 == locked, 0 == unlocked)
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_lock_x_set(Evas_Object *obj, Eina_Bool lock);
@@ -109,7 +109,7 @@ EAPI void elm_object_scroll_lock_x_set(Evas_Object *obj, Eina_Bool lock);
*
* @param obj The object
* @param lock The lock state (1 == locked, 0 == unlocked)
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI void elm_object_scroll_lock_y_set(Evas_Object *obj, Eina_Bool lock);
@@ -119,7 +119,7 @@ EAPI void elm_object_scroll_lock_y_set(Evas_Object *obj, Eina_Bool lock);
* This gets the lock for X axis scrolling.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI Eina_Bool elm_object_scroll_lock_x_get(const Evas_Object *obj);
@@ -129,7 +129,7 @@ EAPI Eina_Bool elm_object_scroll_lock_x_get(const Evas_Object *obj);
* This gets the lock for Y axis scrolling.
*
* @param obj The object
- * @ingroup Scrollhints
+ * @ingroup Elm_Scrollhints
*/
EAPI Eina_Bool elm_object_scroll_lock_y_get(const Evas_Object *obj);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 545d347..91fa297 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -945,8 +945,7 @@ EAPI Evas_Object *
elm_scroller_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_scroller.h b/src/lib/elm_scroller.h
index 0ab2445..fb15696 100644
--- a/src/lib/elm_scroller.h
+++ b/src/lib/elm_scroller.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Scroller Scroller
+ * @defgroup Elm_Scroller Scroller
* @ingroup Elementary
*
* @image html scroller_inheritance_tree.png
diff --git a/src/lib/elm_scroller_eo.h b/src/lib/elm_scroller_eo.h
index 16658cf..fde88df 100644
--- a/src/lib/elm_scroller_eo.h
+++ b/src/lib/elm_scroller_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*
* @{
*/
diff --git a/src/lib/elm_scroller_legacy.h b/src/lib/elm_scroller_legacy.h
index ed70cb4..36343fc 100644
--- a/src/lib/elm_scroller_legacy.h
+++ b/src/lib/elm_scroller_legacy.h
@@ -5,7 +5,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
@@ -21,7 +21,7 @@ EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
* right size horizontally and/or vertically to perfectly fit its content in
* that direction.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h);
@@ -38,7 +38,7 @@ EAPI void elm_scroller_content_min_limit(Evas_Object *o
* region in the virtual content object (0, 0 starting at the top-left of the
* virtual content object) is shown within the scroller.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
@@ -55,7 +55,7 @@ EAPI void elm_scroller_region_show(Evas_Object *obj, Ev
* the time, and #ELM_SCROLLER_POLICY_OFF always keeps it off. This applies
* respectively for the horizontal and vertical scrollbars.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
@@ -68,7 +68,7 @@ EAPI void elm_scroller_policy_set(Evas_Object *obj, Elm
*
* @see elm_scroller_policy_set()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_policy_get(const Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
@@ -82,7 +82,7 @@ EAPI void elm_scroller_policy_get(const Evas_Object *ob
*
* @since 1.8
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_single_direction_set(Evas_Object *obj, Elm_Scroller_Single_Direction single_dir);
@@ -96,7 +96,7 @@ EAPI void elm_scroller_single_direction_set(Evas_Object
*
* @since 1.8
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI Elm_Scroller_Single_Direction elm_scroller_single_direction_get(const Evas_Object *obj);
@@ -117,7 +117,7 @@ EAPI Elm_Scroller_Single_Direction elm_scroller_single_direction_get(const Evas_
*
* @see elm_scroller_region_show()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
@@ -130,7 +130,7 @@ EAPI void elm_scroller_region_get(const Evas_Object *ob
*
* This gets the size of the content object of the scroller.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_child_size_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
@@ -153,7 +153,7 @@ EAPI void elm_scroller_child_size_get(const Evas_Object
*
* @since 1.8
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_snap_set(Evas_Object *obj, Eina_Bool page_h_snap, Eina_Bool page_v_snap);
@@ -168,7 +168,7 @@ EAPI void elm_scroller_page_snap_set(Evas_Object *obj,
*
* @since 1.8
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_snap_get(const Evas_Object *obj, Eina_Bool *page_h_snap, Eina_Bool *page_v_snap);
@@ -184,7 +184,7 @@ EAPI void elm_scroller_page_snap_get(const Evas_Object
* This is enabled by default for both axis. This API will set if it is enabled
* for the given axis with the boolean parameters for each axis.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
@@ -197,7 +197,7 @@ EAPI void elm_scroller_bounce_set(Evas_Object *obj, Ein
*
* @see elm_scroller_bounce_set()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
@@ -219,7 +219,7 @@ EAPI void elm_scroller_bounce_get(const Evas_Object *ob
* including 1.0. If you only want 1 axis to be page "limited", use 0.0 for
* the other axis.
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel);
@@ -237,7 +237,7 @@ EAPI void elm_scroller_page_relative_set(Evas_Object *o
*
* @since 1.7
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_relative_get(const Evas_Object *obj, double *h_pagerel, double *v_pagerel);
@@ -254,7 +254,7 @@ EAPI void elm_scroller_page_relative_get(const Evas_Obj
* @see elm_scroller_page_relative_set()
* @see elm_scroller_page_size_get()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize);
@@ -270,7 +270,7 @@ EAPI void elm_scroller_page_size_set(Evas_Object *obj,
*
* @since 1.7
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_size_get(const Evas_Object *obj, Evas_Coord *h_pagesize, Evas_Coord *v_pagesize);
@@ -290,7 +290,7 @@ EAPI void elm_scroller_page_size_get(const Evas_Object
* @see elm_scroller_page_show()
* @see elm_scroller_page_bring_in()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_current_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
@@ -308,7 +308,7 @@ EAPI void elm_scroller_current_page_get(const Evas_Obje
* @see elm_scroller_page_show()
* @see elm_scroller_page_bring_in()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_last_page_get(const Evas_Object *obj, int *h_pagenumber, int *v_pagenumber);
@@ -334,7 +334,7 @@ EAPI void elm_scroller_last_page_get(const Evas_Object
*
* @see elm_scroller_page_bring_in()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_show(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
@@ -360,7 +360,7 @@ EAPI void elm_scroller_page_show(Evas_Object *obj, int
*
* @see elm_scroller_page_show()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_page_bring_in(Evas_Object *obj, int h_pagenumber, int v_pagenumber);
@@ -383,7 +383,7 @@ EAPI void elm_scroller_page_bring_in(Evas_Object *obj,
*
* @see elm_scroller_region_show()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_region_bring_in(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
@@ -406,7 +406,7 @@ EAPI void elm_scroller_region_bring_in(Evas_Object *obj
*
* Default values for x and y are 0.0
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_gravity_set(Evas_Object *obj, double x, double y);
@@ -421,7 +421,7 @@ EAPI void elm_scroller_gravity_set(Evas_Object *obj, do
*
* @see elm_scroller_gravity_set()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_gravity_get(const Evas_Object *obj, double *x, double *y);
@@ -445,7 +445,7 @@ EAPI void elm_scroller_gravity_get(const Evas_Object *o
*
* @since 1.8
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_movement_block_set(Evas_Object *obj, Elm_Scroller_Movement_Block block);
@@ -459,7 +459,7 @@ EAPI void elm_scroller_movement_block_set(Evas_Object *o
*
* @see elm_scroller_movement_block_set() for more details
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI Elm_Scroller_Movement_Block elm_scroller_movement_block_get(const Evas_Object *obj);
@@ -476,7 +476,7 @@ EAPI Elm_Scroller_Movement_Block elm_scroller_movement_block_get(const Evas_Obj
*
* @since 1.13
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_step_size_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
@@ -491,7 +491,7 @@ EAPI void elm_scroller_step_size_set(Evas_Object *obj,
*
* @since 1.13
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_step_size_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
@@ -507,7 +507,7 @@ EAPI void elm_scroller_step_size_get(const Evas_Object
*
* @since 1.14
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_loop_set(Evas_Object *obj, Eina_Bool loop_h, Eina_Bool loop_v);
@@ -522,7 +522,7 @@ EAPI void elm_scroller_loop_set(Evas_Object *obj, Eina_
*
* @see elm_scroller_loop_set() for more details
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_loop_get(const Evas_Object *obj, Eina_Bool *loop_h, Eina_Bool *loop_v);
@@ -539,7 +539,7 @@ EAPI void elm_scroller_loop_get(const Evas_Object *obj,
*
* @see elm_scroller_wheel_disabled_get()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI void elm_scroller_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled);
@@ -555,6 +555,6 @@ EAPI void elm_scroller_wheel_disabled_set(Evas_Object *
*
* @see elm_scroller_wheel_disabled_set()
*
- * @ingroup Scroller
+ * @ingroup Elm_Scroller
*/
EAPI Eina_Bool elm_scroller_wheel_disabled_get(const Evas_Object *obj);
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 3dcc40a..d77b932 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -557,7 +557,7 @@ _item_new(Evas_Object *obj,
{
Eo *eo_item;
- eo_add(&eo_item, ELM_SEGMENT_CONTROL_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_SEGMENT_CONTROL_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_SEGMENT_ITEM_DATA_GET(eo_item, it);
@@ -697,8 +697,7 @@ EAPI Evas_Object *
elm_segment_control_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_segment_control.h b/src/lib/elm_segment_control.h
index 1880fa6..6a75321 100644
--- a/src/lib/elm_segment_control.h
+++ b/src/lib/elm_segment_control.h
@@ -1,5 +1,5 @@
/**
- * @defgroup SegmentControl SegmentControl
+ * @defgroup Elm_SegmentControl SegmentControl
* @ingroup Elementary
*
* @image html segment_control_inheritance_tree.png
@@ -57,7 +57,7 @@
*/
/**
- * @addtogroup SegmentControl
+ * @addtogroup Elm_SegmentControl
* @{
*/
diff --git a/src/lib/elm_segment_control_legacy.h b/src/lib/elm_segment_control_legacy.h
index ac012ba..e5ed202 100644
--- a/src/lib/elm_segment_control_legacy.h
+++ b/src/lib/elm_segment_control_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new segment control widget on the canvas.
*
- * @ingroup SegmentControl
+ * @ingroup Elm_SegmentControl
*/
EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent);
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index e8b04c6..2e940d9 100644
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -62,8 +62,7 @@ EAPI Evas_Object *
elm_separator_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_separator.h b/src/lib/elm_separator.h
index 6e9768f..de537e7 100644
--- a/src/lib/elm_separator.h
+++ b/src/lib/elm_separator.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Separator Separator
+ * @defgroup Elm_Separator Separator
* @ingroup Elementary
*
* @image html separator_inheritance_tree.png
diff --git a/src/lib/elm_separator_legacy.h b/src/lib/elm_separator_legacy.h
index 2ab53bb..82cf44e 100644
--- a/src/lib/elm_separator_legacy.h
+++ b/src/lib/elm_separator_legacy.h
@@ -5,7 +5,7 @@
*
* @return The separator object, or NULL upon failure
*
- * @ingroup Separator
+ * @ingroup Elm_Separator
*/
EAPI Evas_Object *elm_separator_add(Evas_Object *parent);
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index fd9d78c..37ea643 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -952,8 +952,7 @@ EAPI Evas_Object *
elm_slider_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h
index 5a7d455..00a37c0 100644
--- a/src/lib/elm_slider.h
+++ b/src/lib/elm_slider.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Slider Slider
+ * @defgroup Elm_Slider Slider
* @ingroup Elementary
*
* @image html slider_inheritance_tree.png
@@ -70,7 +70,7 @@
*/
/**
- * @addtogroup Slider
+ * @addtogroup Elm_Slider
* @{
*/
diff --git a/src/lib/elm_slider_common.h b/src/lib/elm_slider_common.h
index ddd074d..dc59220 100644
--- a/src/lib/elm_slider_common.h
+++ b/src/lib/elm_slider_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Slider
+ * @addtogroup Elm_Slider
*
* @{
*/
diff --git a/src/lib/elm_slider_legacy.h b/src/lib/elm_slider_legacy.h
index a7eec57..57cb1aa 100644
--- a/src/lib/elm_slider_legacy.h
+++ b/src/lib/elm_slider_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new slider widget on the canvas.
*
- * @ingroup Slider
+ * @ingroup Elm_Slider
*/
EAPI Evas_Object *elm_slider_add(Evas_Object *parent);
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 2154b7c..c3d5879 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -381,8 +381,7 @@ EAPI Evas_Object *
elm_slideshow_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -411,7 +410,7 @@ _elm_slideshow_item_add(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Slideshow_Ite
{
Eo *eo_item;
- eo_add(&eo_item, ELM_SLIDESHOW_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_SLIDESHOW_ITEM_DATA_GET(eo_item, item);
@@ -432,7 +431,7 @@ _elm_slideshow_item_sorted_insert(Eo *obj, Elm_Slideshow_Data *sd, const Elm_Sli
{
Eo *eo_item;
- eo_add(&eo_item, ELM_SLIDESHOW_ITEM_CLASS, obj);
+ eo_item = eo_add(ELM_SLIDESHOW_ITEM_CLASS, obj);
if (!eo_item) return NULL;
ELM_SLIDESHOW_ITEM_DATA_GET(eo_item, item);
diff --git a/src/lib/elm_slideshow.h b/src/lib/elm_slideshow.h
index c601878..9762f6b 100644
--- a/src/lib/elm_slideshow.h
+++ b/src/lib/elm_slideshow.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Slideshow Slideshow
+ * @defgroup Elm_Slideshow Slideshow
* @ingroup Elementary
*
* @image html slideshow_inheritance_tree.png
@@ -69,7 +69,7 @@
*/
/**
- * @addtogroup Slideshow
+ * @addtogroup Elm_Slideshow
* @{
*/
diff --git a/src/lib/elm_slideshow_common.h b/src/lib/elm_slideshow_common.h
index c79c2a7..baecd5b 100644
--- a/src/lib/elm_slideshow_common.h
+++ b/src/lib/elm_slideshow_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Slideshow
+ * @addtogroup Elm_Slideshow
*
* @{
*/
diff --git a/src/lib/elm_slideshow_legacy.h b/src/lib/elm_slideshow_legacy.h
index e5c0dcc..d16ad0e 100644
--- a/src/lib/elm_slideshow_legacy.h
+++ b/src/lib/elm_slideshow_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new slideshow widget on the canvas.
*
- * @ingroup Slideshow
+ * @ingroup Elm_Slideshow
*/
EAPI Evas_Object *elm_slideshow_add(Evas_Object *parent);
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index de25b9d..b621476 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1403,8 +1403,7 @@ EAPI Evas_Object *
elm_spinner_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_spinner.h b/src/lib/elm_spinner.h
index a6ced26..6da9976 100644
--- a/src/lib/elm_spinner.h
+++ b/src/lib/elm_spinner.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Spinner Spinner
+ * @defgroup Elm_Spinner Spinner
* @ingroup Elementary
*
* @image html spinner_inheritance_tree.png
@@ -53,7 +53,7 @@
*/
/**
- * @addtogroup Spinner
+ * @addtogroup Elm_Spinner
* @{
*/
diff --git a/src/lib/elm_spinner_legacy.h b/src/lib/elm_spinner_legacy.h
index 47c2ae4..1317e9a 100644
--- a/src/lib/elm_spinner_legacy.h
+++ b/src/lib/elm_spinner_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new spinner widget on the canvas.
*
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
*
*/
EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
@@ -23,7 +23,7 @@ EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
*
* @see elm_spinner_special_value_add() for more details.
*
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
* @since 1.8
*/
EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value);
@@ -37,7 +37,7 @@ EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value);
*
* @see elm_spinner_special_value_add() for more details.
*
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
* @since 1.8
*/
EAPI const char *elm_spinner_special_value_get(Evas_Object *obj, double value);
diff --git a/src/lib/elm_sys_notify.c b/src/lib/elm_sys_notify.c
index 5d9f369..c58659a 100644
--- a/src/lib/elm_sys_notify.c
+++ b/src/lib/elm_sys_notify.c
@@ -169,7 +169,7 @@ _elm_sys_notify_servers_set(Eo *obj EINA_UNUSED,
return EINA_FALSE;
}
- eo_add(&sd->servers[i], class_get(), NULL);
+ sd->servers[i] = eo_add(class_get(), NULL);
if (EINA_UNLIKELY(!(sd->servers[i])))
{
CRI("Failed to create notification server");
@@ -201,7 +201,7 @@ _elm_sys_notify_singleton_get(Eo *obj EINA_UNUSED,
void *sd EINA_UNUSED)
{
if (!_singleton)
- eo_add(&_singleton, MY_CLASS, NULL);
+ _singleton = eo_add(MY_CLASS, NULL);
return _singleton;
}
diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index d3ffca8..93099d7 100644
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -214,8 +214,7 @@ EAPI Evas_Object *
elm_table_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_table.h b/src/lib/elm_table.h
index aeef939..fde53ab 100644
--- a/src/lib/elm_table.h
+++ b/src/lib/elm_table.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Table Table
+ * @defgroup Elm_Table Table
* @ingroup Elementary
*
* @image html table_inheritance_tree.png
diff --git a/src/lib/elm_table_legacy.h b/src/lib/elm_table_legacy.h
index 48c3fac..cf6aa54 100644
--- a/src/lib/elm_table_legacy.h
+++ b/src/lib/elm_table_legacy.h
@@ -4,7 +4,7 @@
* @param parent The parent object
* @return The new object or NULL if it cannot be created
*
- * @ingroup Table
+ * @ingroup Elm_Table
*/
EAPI Evas_Object *elm_table_add(Evas_Object *parent);
@@ -23,7 +23,7 @@ EAPI Evas_Object *elm_table_add(Evas_Object *parent);
* a value of 0 for col and row, means the top left cell of the table, and a
* value of 1 for colspan and rowspan means @p subobj only takes that 1 cell.
*
- * @ingroup Table
+ * @ingroup Elm_Table
*/
EAPI void elm_table_pack_set(Evas_Object *subobj, int col, int row, int colspan, int rowspan);
@@ -38,7 +38,7 @@ EAPI void elm_table_pack_set(Evas_Object *subobj, int col, int row, int col
*
* @see elm_table_pack_set()
*
- * @ingroup Table
+ * @ingroup Elm_Table
*/
EAPI void elm_table_pack_get(Evas_Object *subobj, int *col, int *row, int *colspan, int *rowspan);
diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h
index b5a1dbd..cb524b2 100644
--- a/src/lib/elm_theme.h
+++ b/src/lib/elm_theme.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Theme Theme
+ * @defgroup Elm_Theme Theme
* @ingroup Elementary
*
* Elementary uses Edje to theme its widgets, naturally. But for the most
@@ -93,7 +93,7 @@ typedef struct _Elm_Theme Elm_Theme;
* theme set to show this preview before the user decides to apply it to all
* applications).
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Elm_Theme *elm_theme_new(void);
@@ -104,7 +104,7 @@ EAPI Elm_Theme *elm_theme_new(void);
*
* This frees a theme created with elm_theme_new().
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_free(Elm_Theme *th);
@@ -119,7 +119,7 @@ EAPI void elm_theme_free(Elm_Theme *th);
* @p thdst is also set to reference it, with all the theme settings,
* overlays and extensions that @p th had.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_copy(Elm_Theme *th, Elm_Theme *thdst);
@@ -133,7 +133,7 @@ EAPI void elm_theme_copy(Elm_Theme *th, Elm_Theme *thdst);
* so @p th acts as an override to @p thref, but where its overrides
* don't apply, it will fall through to @p thref for configuration.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_ref_set(Elm_Theme *th, Elm_Theme *thref);
@@ -146,7 +146,7 @@ EAPI void elm_theme_ref_set(Elm_Theme *th, Elm_Theme *thref);
* This gets the theme set as the reference theme by elm_theme_ref_set().
* If no theme is set as a reference, NULL is returned.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Elm_Theme *elm_theme_ref_get(const Elm_Theme *th);
@@ -159,7 +159,7 @@ EAPI Elm_Theme *elm_theme_ref_get(const Elm_Theme *th);
* use implicitly unless a specific theme is set. This is also often use
* as a shorthand of NULL.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Elm_Theme *elm_theme_default_get(void);
@@ -181,7 +181,7 @@ EAPI Elm_Theme *elm_theme_default_get(void);
* @see elm_theme_extension_add()
* @see elm_theme_overlay_mmap_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_overlay_add(Elm_Theme *th, const char *item);
@@ -193,7 +193,7 @@ EAPI void elm_theme_overlay_add(Elm_Theme *th, const char *item);
*
* @see elm_theme_overlay_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item);
@@ -215,7 +215,7 @@ EAPI void elm_theme_overlay_del(Elm_Theme *th, const char *item);
* @see elm_theme_extension_add()
* @see elm_theme_overlay_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_overlay_mmap_add(Elm_Theme *th, const Eina_File *f);
@@ -227,7 +227,7 @@ EAPI void elm_theme_overlay_mmap_add(Elm_Theme *th, const Eina_File
*
* @see elm_theme_overlay_mmap_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_overlay_mmap_del(Elm_Theme *th, const Eina_File *f);
@@ -239,7 +239,7 @@ EAPI void elm_theme_overlay_mmap_del(Elm_Theme *th, const Eina_File
*
* @see elm_theme_overlay_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const Eina_List *elm_theme_overlay_list_get(const Elm_Theme *th);
@@ -262,7 +262,7 @@ EAPI const Eina_List *elm_theme_overlay_list_get(const Elm_Theme *th);
*
* @see elm_object_style_set()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item);
@@ -274,7 +274,7 @@ EAPI void elm_theme_extension_add(Elm_Theme *th, const char *item);
*
* @see elm_theme_extension_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item);
@@ -297,7 +297,7 @@ EAPI void elm_theme_extension_del(Elm_Theme *th, const char *item);
*
* @see elm_object_style_set()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_File *f);
@@ -309,7 +309,7 @@ EAPI void elm_theme_extension_mmap_add(Elm_Theme *th, const Eina_Fil
*
* @see elm_theme_extension_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_extension_mmap_del(Elm_Theme *th, const Eina_File *f);
@@ -321,7 +321,7 @@ EAPI void elm_theme_extension_mmap_del(Elm_Theme *th, const Eina_Fil
*
* @see elm_theme_extension_add()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const Eina_List *elm_theme_extension_list_get(const Elm_Theme *th);
@@ -341,7 +341,7 @@ EAPI const Eina_List *elm_theme_extension_list_get(const Elm_Theme *th);
* @see elm_theme_get()
* @see elm_theme_list_get()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_set(Elm_Theme *th, const char *theme);
@@ -357,7 +357,7 @@ EAPI void elm_theme_set(Elm_Theme *th, const char *theme);
* @see elm_theme_set()
* @see elm_theme_list_get()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const char *elm_theme_get(Elm_Theme *th);
@@ -380,7 +380,7 @@ EAPI const char *elm_theme_get(Elm_Theme *th);
* @see elm_theme_set()
* @see elm_theme_get()
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const Eina_List *elm_theme_list_get(const Elm_Theme *th);
@@ -400,7 +400,7 @@ EAPI const Eina_List *elm_theme_list_get(const Elm_Theme *th);
* @c EINA_TRUE if the file was a search-able file and is in the search path,
* and @c EINA_FALSE otherwise.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI char *elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path);
@@ -414,7 +414,7 @@ EAPI char *elm_theme_list_item_path_get(const char *f, Eina_Bool *in_
* Call this function if source theme data has changed in such a way as to
* make any caches Elementary kept invalid.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_flush(Elm_Theme *th);
@@ -424,7 +424,7 @@ EAPI void elm_theme_flush(Elm_Theme *th);
* This will flush all themes in the current application context, by calling
* elm_theme_flush() on each of them.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_full_flush(void);
@@ -438,7 +438,7 @@ EAPI void elm_theme_full_flush(void);
* element names in a list of strings. Free this with
* elm_theme_name_available_list_free() when you are done with the list.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Eina_List *elm_theme_name_available_list_new(void);
@@ -449,7 +449,7 @@ EAPI Eina_List *elm_theme_name_available_list_new(void);
* elm_theme_name_available_list_new(). Once freed the list should no longer
* be used. a new list mys be created.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_theme_name_available_list_free(Eina_List *list);
@@ -468,7 +468,7 @@ EAPI void elm_theme_name_available_list_free(Eina_List *list);
* configuration difficult. Avoid any custom themes at all if it can be
* helped.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th);
@@ -483,7 +483,7 @@ EAPI void elm_object_theme_set(Evas_Object *obj, Elm_Theme *th);
* the specific theme set for that specific object. See elm_object_theme_set()
* for more information.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Elm_Theme *elm_object_theme_get(const Evas_Object *obj);
@@ -497,7 +497,7 @@ EAPI Elm_Theme *elm_object_theme_get(const Evas_Object *obj);
* This function is used to return data items from edc in @p th, an overlay, or an extension.
* It works the same way as edje_file_data_get() except that the return is stringshared.
*
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key);
@@ -521,7 +521,7 @@ EAPI const char *elm_theme_data_get(Elm_Theme *th, const char *key);
* request.
*
* @since 1.8
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group);
@@ -543,7 +543,7 @@ EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group);
* may result in a leak.
*
* @since 1.8
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI Eina_List *elm_theme_group_base_list(Elm_Theme *th, const char *base);
@@ -558,7 +558,7 @@ EAPI const char *elm_theme_group_path_find(Elm_Theme *th, const char *group);
* example a theme selector.
*
* @since 1.8
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const char *elm_theme_system_dir_get(void);
@@ -576,7 +576,7 @@ EAPI const char *elm_theme_system_dir_get(void);
* directory is normally expected to be writable by the user.
*
* @since 1.8
- * @ingroup Theme
+ * @ingroup Elm_Theme
*/
EAPI const char *elm_theme_user_dir_get(void);
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 5204d11..65558b4 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -586,8 +586,7 @@ EAPI Evas_Object *
elm_thumb_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
@@ -815,11 +814,11 @@ elm_thumb_ethumb_client_connected_get(void)
return _elm_ethumb_connected;
}
-EOLIAN static Eina_Bool
-_elm_thumb_editable_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool edit)
+EOLIAN static void
+_elm_thumb_evas_draggable_interface_drag_target_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool edit)
{
edit = !!edit;
- if (sd->edit == edit) return EINA_TRUE;
+ if (sd->edit == edit) return;
sd->edit = edit;
if (sd->edit)
@@ -835,11 +834,11 @@ _elm_thumb_editable_set(Eo *obj, Elm_Thumb_Data *sd, Eina_Bool edit)
NULL, NULL,
_elm_thumb_dnd_cb, obj);
- return EINA_TRUE;
+ return;
}
EOLIAN static Eina_Bool
-_elm_thumb_editable_get(Eo *obj EINA_UNUSED, Elm_Thumb_Data *sd)
+_elm_thumb_evas_draggable_interface_drag_target_get(Eo *obj EINA_UNUSED, Elm_Thumb_Data *sd)
{
return sd->edit;
}
@@ -862,5 +861,18 @@ elm_thumb_file_get(const Eo *obj, const char **file, const char **key)
efl_file_get((Eo *) obj, file, key);
}
+/* Legacy deprecated functions */
+EAPI Eina_Bool
+elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit)
+{
+ evas_draggable_interface_drag_target_set(obj, edit);
+ return EINA_TRUE;
+}
+
+EAPI Eina_Bool
+elm_thumb_editable_get(const Evas_Object *obj)
+{
+ return evas_draggable_interface_drag_target_get(obj);
+}
#include "elm_thumb.eo.c"
diff --git a/src/lib/elm_thumb.eo b/src/lib/elm_thumb.eo
index 6dd3d49..9c1479b 100644
--- a/src/lib/elm_thumb.eo
+++ b/src/lib/elm_thumb.eo
@@ -8,7 +8,8 @@ enum Elm.Thumb.Animation_Setting
last
}
-class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface)
+class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface,
+ Evas.Draggable_Interface)
{
eo_prefix: elm_obj_thumb;
methods {
@@ -98,26 +99,6 @@ class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface)
orient: Ethumb_Thumb_Orientation; [[The orientation setting.]]
}
}
- @property editable {
- set {
- [[Make the thumbnail 'editable'.
-
- This means the thumbnail is a valid drag target for drag and
- drop, and can be cut or pasted too.
- ]]
- return: bool;
- }
- get {
- [[Get whether the thumbnail is editable.
-
- This means the thumbnail is a valid drag target for drag and
- drop, and can be cut or pasted too.
- ]]
- }
- values {
- edit: bool; [[The editable state, default is $false.]]
- }
- }
@property aspect {
set {
[[Set the aspect for the thumb object.
@@ -226,6 +207,8 @@ class Elm.Thumb (Elm.Layout, Efl.File, Evas.Clickable_Interface)
Evas.Object_Smart.add;
Evas.Object_Smart.del;
Evas.Object_Smart.show;
+ Evas.Draggable_Interface.drag_target.set;
+ Evas.Draggable_Interface.drag_target.get;
}
events {
generate,error;
diff --git a/src/lib/elm_thumb.h b/src/lib/elm_thumb.h
index 15cc8e6..6b5039d 100644
--- a/src/lib/elm_thumb.h
+++ b/src/lib/elm_thumb.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Thumb Thumbnail
+ * @defgroup Elm_Thumb Thumbnail
* @ingroup Elementary
*
* @image html thumb_inheritance_tree.png
@@ -51,7 +51,7 @@
*/
/**
- * @addtogroup Thumb
+ * @addtogroup Elm_Thumb
* @{
*/
diff --git a/src/lib/elm_thumb_common.h b/src/lib/elm_thumb_common.h
index c65f902..11dfbfd 100644
--- a/src/lib/elm_thumb_common.h
+++ b/src/lib/elm_thumb_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Thumb
+ * @addtogroup Elm_Thumb
*
* @{
*/
diff --git a/src/lib/elm_thumb_legacy.h b/src/lib/elm_thumb_legacy.h
index bd68b28..28b849e 100644
--- a/src/lib/elm_thumb_legacy.h
+++ b/src/lib/elm_thumb_legacy.h
@@ -7,7 +7,7 @@
* @see elm_thumb_file_set()
* @see elm_thumb_ethumb_client_get()
*
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
*/
EAPI Evas_Object *elm_thumb_add(Evas_Object *parent);
@@ -23,7 +23,7 @@ EAPI Evas_Object *elm_thumb_add(Evas_Object *parent);
* @see elm_thumb_reload()
* @see elm_thumb_animate()
*
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
*
* @param[in] file The path to file that will be used as thumbnail source.
* @param[in] key The key used in case of an EET file.
@@ -37,11 +37,34 @@ EAPI void elm_thumb_file_set(Eo *obj, const char *file, const char *key);
* @see elm_thumb_file_set()
* @see elm_thumb_path_get()
*
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
*
* @param[out] file The path to file that will be used as thumbnail source.
* @param[out] key The key used in case of an EET file.
*/
EAPI void elm_thumb_file_get(const Eo *obj, const char **file, const char **key);
+/**
+ * @brief Make the thumbnail 'editable'.
+ *
+ * This means the thumbnail is a valid drag target for drag and drop, and can
+ * be cut or pasted too.
+ *
+ * @param[in] edit The editable state, default is @c false.
+ *
+ * @ingroup Elm_Thumb
+ */
+EAPI Eina_Bool elm_thumb_editable_set(Evas_Object *obj, Eina_Bool edit);
+
+/**
+ * @brief Get whether the thumbnail is editable.
+ *
+ * This means the thumbnail is a valid drag target for drag and drop, and can
+ * be cut or pasted too.
+ *
+ * @return The editable state, default is @c false.
+ *
+ * @ingroup Elm_Thumb
+ */
+EAPI Eina_Bool elm_thumb_editable_get(const Evas_Object *obj);
#include "elm_thumb.eo.legacy.h"
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 327b227..1611969 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2374,8 +2374,7 @@ _item_new(Evas_Object *obj,
ELM_TOOLBAR_DATA_GET(obj, sd);
- Eo *eo_it = NULL;
- eo_add(&eo_it, ELM_TOOLBAR_ITEM_CLASS, obj);
+ Eo *eo_it = eo_add(ELM_TOOLBAR_ITEM_CLASS, obj);
if (!eo_it) return NULL;
@@ -2990,8 +2989,7 @@ EAPI Evas_Object *
elm_toolbar_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_toolbar.h b/src/lib/elm_toolbar.h
index 44777ca..ef237c4 100644
--- a/src/lib/elm_toolbar.h
+++ b/src/lib/elm_toolbar.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Toolbar Toolbar
+ * @defgroup Elm_Toolbar Toolbar
* @ingroup Elementary
*
* @image html toolbar_inheritance_tree.png
@@ -64,7 +64,7 @@
*/
/**
- * @addtogroup Toolbar
+ * @addtogroup Elm_Toolbar
* @{
*/
diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index 4e1c37b..a8e1f2c 100644
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Toolbar
+ * @addtogroup Elm_Toolbar
*
* @{
*/
diff --git a/src/lib/elm_toolbar_eo.h b/src/lib/elm_toolbar_eo.h
index 8a7c550..604ca3f 100644
--- a/src/lib/elm_toolbar_eo.h
+++ b/src/lib/elm_toolbar_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*
* @{
*/
diff --git a/src/lib/elm_toolbar_legacy.h b/src/lib/elm_toolbar_legacy.h
index 16d325a..7abc10f 100644
--- a/src/lib/elm_toolbar_legacy.h
+++ b/src/lib/elm_toolbar_legacy.h
@@ -7,7 +7,7 @@
*
* This function inserts a new toolbar widget on the canvas.
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
@@ -18,7 +18,7 @@ EAPI Evas_Object *elm_toolbar_add(Evas_Object *parent);
* @param reorder_mode The reorder mode
* (@c EINA_TRUE = on, @c EINA_FALSE = off)
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EAPI void elm_toolbar_reorder_mode_set(Evas_Object *obj, Eina_Bool reorder_mode);
@@ -29,7 +29,7 @@ EAPI void elm_toolbar_reorder_mode_set(Evas_Object *obj
* @return The reorder mode
* (@c EINA_TRUE = on, @c EINA_FALSE = off)
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EAPI Eina_Bool elm_toolbar_reorder_mode_get(const Evas_Object *obj);
@@ -43,7 +43,7 @@ EAPI Eina_Bool elm_toolbar_reorder_mode_get(const Evas_Objec
* This will expand the transverse length of the item according the transverse length of the toolbar.
* The default is what the transverse length of the item is set according its min value.
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EAPI void elm_toolbar_transverse_expanded_set(Evas_Object *obj, Eina_Bool transverse_expanded);
@@ -56,7 +56,7 @@ EAPI void elm_toolbar_transverse_expanded_set(Evas_Objec
*
* @see elm_toolbar_transverse_expand_set() for details.
*
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
*/
EAPI Eina_Bool elm_toolbar_transverse_expanded_get(const Evas_Object *obj);
diff --git a/src/lib/elm_tooltip.h b/src/lib/elm_tooltip.h
index cb508a6..81eaced 100644
--- a/src/lib/elm_tooltip.h
+++ b/src/lib/elm_tooltip.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Tooltips Tooltips
+ * @defgroup Elm_Tooltips Tooltips
* @ingroup Elementary
*
* The Tooltip is an (internal, for now) smart object used to show a
@@ -15,7 +15,7 @@
* These values should be used in conjunction to elm_object_tooltip_orient_set() to
* set the position around which the tooltip should appear(relative to its parent)
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
typedef enum
{
@@ -38,7 +38,7 @@ typedef enum
*
* @param obj The tooltip's anchor object
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
* @see elm_object_tooltip_move_freeze_pop()
* @see elm_object_tooltip_move_freeze_get()
* @since 1.9
@@ -50,7 +50,7 @@ EAPI void elm_object_tooltip_move_freeze_push(Evas_Object *obj);
*
* @param obj The tooltip's anchor object
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
* @see elm_object_tooltip_move_freeze_push()
* @since 1.9
*/
@@ -64,7 +64,7 @@ EAPI void elm_object_tooltip_move_freeze_pop(Evas_Object *obj);
* @param obj The tooltip's anchor object
* @return The movement freeze count
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
* @see elm_object_tooltip_move_freeze_push()
* @since 1.9
*/
@@ -79,7 +79,7 @@ EAPI int elm_object_tooltip_move_freeze_get(const Evas_Object *obj);
* @param obj The owner widget.
* @param orient The orientation of the tooltip.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
* @see Elm_Tooltip_Orient for possible values.
* @since 1.9
*/
@@ -91,7 +91,7 @@ EAPI void elm_object_tooltip_orient_set(Evas_Object *obj, Elm_Tooltip_Orient ori
* @param obj The owner object
* @return The orientation of the tooltip
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
* @see elm_object_tooltip_orient_set()
* @ref Elm_Tooltip_Orient for possible values.
*/
@@ -125,7 +125,7 @@ typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb)(void *data, Evas_Object *obj
* showed again with new content.
* This can force show more than one tooltip at a time.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_show(Evas_Object *obj);
@@ -136,7 +136,7 @@ EAPI void elm_object_tooltip_show(Evas_Object *obj);
*
* Force hide the tooltip and (re)enable future mouse interations.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_hide(Evas_Object *obj);
@@ -146,7 +146,7 @@ EAPI void elm_object_tooltip_hide(Evas_Object *obj);
* @param obj The tooltip object.
* @param text The text to be displayed.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_text_set(Evas_Object *obj, const char *text);
EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *obj, const char *domain, const char *text);
@@ -170,7 +170,7 @@ EAPI void elm_object_tooltip_domain_translatable_text_set(Evas_Object *ob
* return a valid Evas_Object. This object is then managed fully by
* tooltip system and is deleted when the tooltip is gone.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
@@ -185,7 +185,7 @@ EAPI void elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip
*
* @see elm_object_tooltip_content_cb_set()
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_unset(Evas_Object *obj);
@@ -199,7 +199,7 @@ EAPI void elm_object_tooltip_unset(Evas_Object *obj);
* @param obj an object with tooltip already set.
* @param style the theme style to use (default, transparent, ...)
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *style);
@@ -210,7 +210,7 @@ EAPI void elm_object_tooltip_style_set(Evas_Object *obj, const char *styl
* @return style the theme style in use, defaults to "default". If the
* object does not have a tooltip set, then NULL is returned.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
@@ -224,7 +224,7 @@ EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
* This function allows a tooltip to expand beyond its parent window's canvas.
* It will instead be limited only by the size of the display.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI Eina_Bool elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool disable);
@@ -238,7 +238,7 @@ EAPI Eina_Bool elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool
* its parent window's canvas.
* It will instead be limited only by the size of the display.
*
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
EAPI Eina_Bool elm_object_tooltip_window_mode_get(const Evas_Object *obj);
diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h
index ced6656..abfeaea 100644
--- a/src/lib/elm_transit.h
+++ b/src/lib/elm_transit.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Transit Transit
+ * @defgroup Elm_Transit Transit
* @ingroup Elementary
*
* Transit is designed to apply various animated transition effects to @c
@@ -160,7 +160,7 @@ typedef void (*Elm_Transit_Del_Cb)(void *data, Elm_Transit *transit);
*
* @return The transit object.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Elm_Transit *elm_transit_add(void);
@@ -177,7 +177,7 @@ EAPI Elm_Transit *elm_transit_add(void);
*
* @param transit The transit object to be deleted.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_del(Elm_Transit *transit);
@@ -209,7 +209,7 @@ EAPI void elm_transit_del(Elm_Transit *transit);
* at the end of the effect, it must finalize the animation and free the
* @p data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning The transit will free the context data at the and of the
* transition with the data_free_cb function.
* Do not share the context data in between different transit objects.
@@ -232,7 +232,7 @@ EAPI void elm_transit_effect_add(Elm_Transit *transit, Elm_Tra
* @param transition_cb The operation function.
* @param effect The context data of the effect.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Transit_Effect_Transition_Cb transition_cb, Elm_Transit_Effect *effect);
@@ -253,7 +253,7 @@ EAPI void elm_transit_effect_del(Elm_Transit *transit, Elm_Tra
* @param transit The transit object.
* @param obj Object to be animated.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is not allowed to add a new object after transit begins.
*/
EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Object *obj);
@@ -268,7 +268,7 @@ EAPI void elm_transit_object_add(Elm_Transit *transit, Evas_Ob
* @param transit The transit object.
* @param obj Object to be removed from @p transit.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is not allowed to remove objects after transit begins.
*/
EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas_Object *obj);
@@ -279,7 +279,7 @@ EAPI void elm_transit_object_remove(Elm_Transit *transit, Evas
* @param transit The transit object.
* @return a Eina_List with the objects from the transit.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit);
@@ -293,7 +293,7 @@ EAPI const Eina_List *elm_transit_objects_get(const Elm_Transit *transit);
* @param transit The transit object.
* @param state_keep retain the state or not.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit *transit, Eina_Bool state_keep);
@@ -308,7 +308,7 @@ EAPI void elm_transit_objects_final_state_keep_set(Elm_Transit
* @return @c EINA_TRUE means the states of the objects will be reset.
* If @p transit is NULL, @c EINA_FALSE is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_Bool elm_transit_objects_final_state_keep_get(const Elm_Transit *transit);
@@ -327,7 +327,7 @@ EAPI Eina_Bool elm_transit_objects_final_state_keep_get(const Elm_T
* @param enabled Events are received when enabled is @c EINA_TRUE, and
* ignored otherwise.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_event_enabled_set(Elm_Transit *transit, Eina_Bool enabled);
@@ -340,7 +340,7 @@ EAPI void elm_transit_event_enabled_set(Elm_Transit *transit,
* @return @c EINA_TRUE, when event is enabled. If @p transit is NULL
* @c EINA_FALSE is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *transit);
@@ -355,7 +355,7 @@ EAPI Eina_Bool elm_transit_event_enabled_get(const Elm_Transit *tra
* the deletion of the transit.
* @param data Callback function user data. It is the @p op parameter.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_del_cb_set(Elm_Transit *transit, Elm_Transit_Del_Cb cb, void *data);
@@ -371,7 +371,7 @@ EAPI void elm_transit_del_cb_set(Elm_Transit *transit, Elm_Tra
* @param transit The transit object.
* @param reverse @c EINA_TRUE means the auto_reverse is on.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_auto_reverse_set(Elm_Transit *transit, Eina_Bool reverse);
@@ -384,7 +384,7 @@ EAPI void elm_transit_auto_reverse_set(Elm_Transit *transit, E
* @return @c EINA_TRUE means auto reverse is on. If @p transit is NULL
* @c EINA_FALSE is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *transit);
@@ -401,7 +401,7 @@ EAPI Eina_Bool elm_transit_auto_reverse_get(const Elm_Transit *tran
* @param transit The transit object
* @param repeat Repeat count
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_repeat_times_set(Elm_Transit *transit, int repeat);
@@ -414,7 +414,7 @@ EAPI void elm_transit_repeat_times_set(Elm_Transit *transit, i
* @return The repeat count. If @p transit is NULL
* 0 is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI int elm_transit_repeat_times_get(const Elm_Transit *transit);
@@ -439,7 +439,7 @@ EAPI int elm_transit_repeat_times_get(const Elm_Transit *tran
* @param transit The transit object.
* @param tween_mode The tween type.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode);
@@ -452,7 +452,7 @@ EAPI void elm_transit_tween_mode_set(Elm_Transit *transit, Elm
* @return The tween type. If @p transit is NULL
* ELM_TRANSIT_TWEEN_MODE_LINEAR is returned.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit);
@@ -486,7 +486,7 @@ EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transi
*
* @see elm_transit_tween_mode_factor_get()
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_tween_mode_factor_set(Elm_Transit *transit, double v1, double v2);
@@ -501,7 +501,7 @@ EAPI void elm_transit_tween_mode_factor_set(Elm_Transit *trans
*
* @see elm_transit_tween_mode_factor_set()
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_tween_mode_factor_get(const Elm_Transit *transit, double *v1, double *v2);
@@ -537,7 +537,7 @@ EAPI void elm_transit_tween_mode_factor_get(const Elm_Transit
*
* @see elm_transit_tween_mode_factor_set()
* @since 1.13
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_tween_mode_factor_n_set(Elm_Transit *transit, unsigned int v_size, double *v);
@@ -549,7 +549,7 @@ EAPI void elm_transit_tween_mode_factor_n_set(Elm_Transit *tra
* @param transit The transit object.
* @param duration The animation time.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_duration_set(Elm_Transit *transit, double duration);
@@ -562,7 +562,7 @@ EAPI void elm_transit_duration_set(Elm_Transit *transit, doubl
*
* @return The transit animation time.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI double elm_transit_duration_get(const Elm_Transit *transit);
@@ -574,7 +574,7 @@ EAPI double elm_transit_duration_get(const Elm_Transit *transit)
*
* @param transit The transit object.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_go(Elm_Transit *transit);
@@ -594,7 +594,7 @@ EAPI void elm_transit_go(Elm_Transit *transit);
* @return @c EINA_TRUE if transition is reverted, @c EINA_FALSE otherwise.
*
* @since 1.18
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_Bool elm_transit_revert(Elm_Transit *transit);
@@ -607,7 +607,7 @@ EAPI Eina_Bool elm_transit_revert(Elm_Transit *transit);
* @param in The interval value in seconds
*
* @since 1.14
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_go_in(Elm_Transit *transit, double in);
@@ -622,7 +622,7 @@ EAPI void elm_transit_go_in(Elm_Transit *transit, double in);
* @param transit The transit object.
* @param paused Whether the transition should be paused or not.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_paused_set(Elm_Transit *transit, Eina_Bool paused);
@@ -637,7 +637,7 @@ EAPI void elm_transit_paused_set(Elm_Transit *transit, Eina_Bo
* @return @c EINA_TRUE means transition is paused. If @p transit is NULL
* @c EINA_FALSE is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_Bool elm_transit_paused_get(const Elm_Transit *transit);
@@ -654,7 +654,7 @@ EAPI Eina_Bool elm_transit_paused_get(const Elm_Transit *transit);
* @return The time progression value. If @p transit is NULL
* 0 is returned
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI double elm_transit_progress_value_get(const Elm_Transit *transit);
@@ -672,7 +672,7 @@ EAPI double elm_transit_progress_value_get(const Elm_Transit *tr
* transit, and will be started as soon as @p transit ends. See @ref
* transit_example_02_explained for a full example.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_chain_transit_add(Elm_Transit *transit, Elm_Transit *chain_transit);
@@ -687,7 +687,7 @@ EAPI void elm_transit_chain_transit_add(Elm_Transit *transit,
*
* This function remove the @p chain_transit transition from the @p transit.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_chain_transit_del(Elm_Transit *transit, Elm_Transit *chain_transit);
@@ -699,7 +699,7 @@ EAPI void elm_transit_chain_transit_del(Elm_Transit *transit,
* @param transit The transit object.
* @return chain transit list.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Eina_List *elm_transit_chain_transits_get(const Elm_Transit *transit);
@@ -717,7 +717,7 @@ EAPI Eina_List *elm_transit_chain_transits_get(const Elm_Transit *tr
* @see evas_map_smooth_set()
* @since 1.8
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI void elm_transit_smooth_set(Elm_Transit *transit, Eina_Bool enabled);
@@ -750,7 +750,7 @@ EAPI Eina_Bool elm_transit_smooth_get(const Elm_Transit *transit);
* @param to_h Object height size when effect ends.
* @return Resizing effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Elm_Transit_Effect *elm_transit_effect_resizing_add(Elm_Transit *transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
@@ -769,7 +769,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_resizing_add(Elm_Transit *transit
* @param to_dy Y Position variation when effect ends.
* @return Translation effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -790,7 +790,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_translation_add(Elm_Transit *tran
* @param to_rate Scale rate when effect ends.
* @return Zoom effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -814,7 +814,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_zoom_add(Elm_Transit *transit, fl
* @param cw Flipping Direction. @c EINA_TRUE is clock-wise.
* @return Flip effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -838,7 +838,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_flip_add(Elm_Transit *transit, El
* @param cw Flipping Direction. @c EINA_TRUE is clock-wise.
* @return Resizeable flip effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -859,7 +859,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_resizable_flip_add(Elm_Transit *t
* @param dir Wipe Direction.
* @return Wipe effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -886,7 +886,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_wipe_add(Elm_Transit *transit, El
* @param to_a RGB A when effect ends.
* @return Color effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Elm_Transit_Effect *elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
@@ -904,7 +904,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_color_add(Elm_Transit *transit, u
* @param transit Transit object.
* @return Fade effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the color information about the objects,
@@ -926,7 +926,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_fade_add(Elm_Transit *transit);
* @param transit Transit object.
* @return Blend effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the color information about the objects,
@@ -947,7 +947,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_blend_add(Elm_Transit *transit);
* @param to_degree Degree when effect is ends.
* @return Rotation effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
* @warning It is highly recommended just create a transit with this effect when
* the window that the objects of the transit belongs has already been created.
* This is because this effect needs the geometry information about the objects,
@@ -987,7 +987,7 @@ EAPI Elm_Transit_Effect *elm_transit_effect_rotation_add(Elm_Transit *transit
* elm_transit_effect_image_animation_context_free() function.
* @return Image Animation effect context data.
*
- * @ingroup Transit
+ * @ingroup Elm_Transit
*/
EAPI Elm_Transit_Effect *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);
/**
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index f93a5da..65a5d6e 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -284,8 +284,7 @@ EAPI Evas_Object *
elm_video_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent);
+ Evas_Object *obj = eo_add(MY_CLASS, parent);
return obj;
}
diff --git a/src/lib/elm_video.h b/src/lib/elm_video.h
index 31a8dbd..345b9d8 100644
--- a/src/lib/elm_video.h
+++ b/src/lib/elm_video.h
@@ -1,8 +1,8 @@
/**
- * @defgroup Video Video
+ * @defgroup Elm_Video Video
* @ingroup Elementary
*
- * @addtogroup Video
+ * @addtogroup Elm_Video
* @{
*
* @image html video_inheritance_tree.png
diff --git a/src/lib/elm_video_legacy.h b/src/lib/elm_video_legacy.h
index 184d31a..57ca8da 100644
--- a/src/lib/elm_video_legacy.h
+++ b/src/lib/elm_video_legacy.h
@@ -8,7 +8,7 @@
*
* @see elm_object_part_content_set()
*
- * @ingroup Video
+ * @ingroup Elm_Video
*/
EAPI Evas_Object *elm_player_add(Evas_Object *parent);
@@ -22,7 +22,7 @@ EAPI Evas_Object *elm_player_add(Evas_Object *parent);
*
* @see elm_video_file_set()
*
- * @ingroup Video
+ * @ingroup Elm_Video
*/
EAPI Evas_Object *elm_video_add(Evas_Object *parent);
@@ -38,7 +38,7 @@ EAPI Evas_Object *elm_video_add(Evas_Object *parent);
* @see elm_video_add()
* @see elm_player_add()
*
- * @ingroup Video
+ * @ingroup Elm_Video
*
* @param[in] filename The file or URI to target.
Local files can be specified using file:// or by using full file paths.
@@ -52,7 +52,7 @@ EAPI Eina_Bool elm_video_file_set(Eo *obj, const char *filename);
*
* @brief Get the file or URI that is used as the video source.
*
- * @ingroup Video
+ * @ingroup Elm_Video
*
* @param filename The file or URI.
*
diff --git a/src/lib/elm_web.h b/src/lib/elm_web.h
index a64001a..43099ff 100644
--- a/src/lib/elm_web.h
+++ b/src/lib/elm_web.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Web Web
+ * @defgroup Elm_Web Web
* @ingroup Elementary
*
* @image html web_inheritance_tree.png
@@ -88,13 +88,19 @@
*/
/**
- * @addtogroup Web
+ * @addtogroup Elm_Web
* @{
*/
#include "elm_web_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "elm_web_eo.h"
+
+#undef ELM_WEB_CLASS
+#define ELM_WEB_CLASS elm_web_real_class_get()
+
+EAPI const Eo_Class *elm_web_real_class_get(void);
+
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_web_legacy.h"
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 37d1d75..89db9d5 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -9,7 +9,7 @@
#include "elm_priv.h"
#include "elm_widget_web.h"
-#define MY_CLASS ELM_WEB_CLASS
+#define MY_CLASS elm_web_class_get()
#define MY_CLASS_NAME "Elm_Web"
#define MY_CLASS_NAME_LEGACY "elm_web"
@@ -76,12 +76,17 @@ elm_need_web(void)
EAPI Evas_Object *
elm_web_add(Evas_Object *parent)
{
- Evas_Object *obj;
-
if (!parent || !ewm.class_get) return NULL;
- eo_add(&obj, ewm.class_get(), parent);
- return obj;
+ return eo_add(ewm.class_get(), parent);
+}
+
+EAPI const Eo_Class *
+elm_web_real_class_get(void)
+{
+ if (!ewm.class_get) return NULL;
+
+ return ewm.class_get();
}
EOLIAN static Eo *
@@ -216,4 +221,7 @@ _elm_web_init(const char *engine)
return EINA_TRUE;
}
+#undef ELM_WEB_CLASS
+#define ELM_WEB_CLASS elm_web_class_get()
+
#include "elm_web.eo.c"
diff --git a/src/lib/elm_web_common.h b/src/lib/elm_web_common.h
index 04bbea2..6373f18 100644
--- a/src/lib/elm_web_common.h
+++ b/src/lib/elm_web_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Web
+ * @addtogroup Elm_Web
*
* @{
*/
diff --git a/src/lib/elm_web_legacy.h b/src/lib/elm_web_legacy.h
index e2c2577..ff4cf09 100644
--- a/src/lib/elm_web_legacy.h
+++ b/src/lib/elm_web_legacy.h
@@ -7,7 +7,7 @@
* @see elm_web_url_set()
* @see elm_web_webkit_view_get()
*
- * @ingroup Web
+ * @ingroup Elm_Web
*/
EAPI Evas_Object *elm_web_add(Evas_Object *parent);
@@ -25,7 +25,7 @@ EAPI Evas_Object *elm_web_add(Evas_Object *parent);
*
* @see elm_web_url_set()
*
- * @ingroup Web
+ * @ingroup Elm_Web
*/
EINA_DEPRECATED EAPI Eina_Bool elm_web_uri_set(Evas_Object *obj, const char *uri);
@@ -43,7 +43,7 @@ EINA_DEPRECATED EAPI Eina_Bool elm_web_uri_set(Evas_Object *obj, const c
*
* @see elm_web_url_get()
*
- * @ingroup Web
+ * @ingroup Elm_Web
*/
EINA_DEPRECATED EAPI const char *elm_web_uri_get(const Evas_Object *obj);
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index ac7aeb3..4121519 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -342,6 +342,7 @@ _elm_widget_evas_object_smart_add(Eo *obj, Elm_Widget_Smart_Data *priv)
priv->obj = obj;
priv->mirrored_auto_mode = EINA_TRUE; /* will follow system locale
* settings */
+ priv->focus_move_policy_auto_mode = EINA_TRUE;
priv->focus_region_show_mode = ELM_FOCUS_REGION_SHOW_WIDGET;
elm_widget_can_focus_set(obj, EINA_TRUE);
priv->is_mirrored = elm_config_mirrored_get();
@@ -791,6 +792,27 @@ _elm_widget_focus_highlight_style_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data
}
static void
+_child_focus_order_update(Evas_Object* parent, Evas_Object* obj)
+{
+ const Eina_List *l;
+ Evas_Object *child;
+ ELM_WIDGET_DATA_GET(parent, sdp);
+ EINA_LIST_FOREACH(sdp->subobjs, l, child)
+ {
+ if (!_elm_widget_is(child) || (child == obj)) continue;
+ ELM_WIDGET_DATA_GET(child,sdc);
+
+ if(sdc->can_focus || (sdc->child_can_focus))
+ {
+ focus_order++;
+ sdc->focus_order = focus_order;
+ }
+ _child_focus_order_update(child, NULL);
+ }
+
+}
+
+static void
_parent_focus(Evas_Object *obj, Elm_Object_Item *item)
{
API_ENTRY return;
@@ -819,6 +841,8 @@ _parent_focus(Evas_Object *obj, Elm_Object_Item *item)
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
_elm_access_highlight_set(obj);
+
+ if (o) _child_focus_order_update(o, obj);
}
static void
@@ -3576,6 +3600,46 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSE
return EINA_TRUE;
}
+/**
+ * @internal
+ *
+ * Resets the focus_move_policy mode from the system one
+ * for widgets that are in automatic mode.
+ *
+ * @param obj The widget.
+ *
+ */
+static void
+_elm_widget_focus_move_policy_reload(Evas_Object *obj)
+{
+ API_ENTRY return;
+ Elm_Focus_Move_Policy focus_move_policy = elm_config_focus_move_policy_get();
+
+ if (elm_widget_focus_move_policy_automatic_get(obj) &&
+ (sd->focus_move_policy != focus_move_policy))
+ {
+ sd->focus_move_policy = focus_move_policy;
+ }
+}
+
+EOLIAN static void
+_elm_widget_focus_reconfigure(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
+{
+ const Eina_List *l;
+ Evas_Object *child;
+ API_ENTRY return;
+
+ EINA_LIST_FOREACH(sd->subobjs, l, child)
+ {
+ if (elm_widget_is(child))
+ elm_widget_focus_reconfigure(child);
+ }
+
+ if (sd->hover_obj) elm_widget_focus_reconfigure(sd->hover_obj);
+
+ _elm_widget_focus_move_policy_reload(obj);
+}
+
EAPI void
elm_widget_content_part_set(Evas_Object *obj,
const char *part,
@@ -4244,6 +4308,43 @@ _elm_widget_focus_move_policy_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
if (sd->focus_move_policy == policy) return;
sd->focus_move_policy = policy;
}
+
+/**
+ * Returns the widget's focus_move_policy mode setting.
+ *
+ * @param obj The widget.
+ * @return focus_move_policy mode setting of the object.
+ *
+ **/
+EOLIAN static Eina_Bool
+_elm_widget_focus_move_policy_automatic_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd)
+{
+ return sd->focus_move_policy_auto_mode;
+}
+
+/**
+ * @internal
+ *
+ * Sets the widget's focus_move_policy mode setting.
+ * When widget in automatic mode, it follows the system focus_move_policy mode set by
+ * elm_config_focus_move_policy_set().
+ * @param obj The widget.
+ * @param automatic EINA_TRUE for auto focus_move_policy mode. EINA_FALSE for manual.
+ */
+EOLIAN static void
+_elm_widget_focus_move_policy_automatic_set(Eo *obj, Elm_Widget_Smart_Data *sd, Eina_Bool automatic)
+{
+ if (sd->focus_move_policy_auto_mode != automatic)
+ {
+ sd->focus_move_policy_auto_mode = automatic;
+
+ if (automatic)
+ {
+ elm_widget_focus_move_policy_set(obj, elm_config_focus_move_policy_get());
+ }
+ }
+}
+
static void
_track_obj_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index e5db767..b618b4d 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -821,6 +821,18 @@ abstract Elm.Widget (Evas.Object_Smart, Elm.Interface_Atspi_Accessible, Elm.Inte
policy: Elm.Focus.Move_Policy; [[Object's focus move policy.]]
}
}
+ @property focus_move_policy_automatic {
+ [[Control the widget's focus_move_policy mode setting.]]
+ set {
+ }
+ get {
+ }
+ values {
+ automatic: bool; [[$true to follow system focus move policy change, $false otherwise]]
+ }
+ }
+ focus_reconfigure {
+ }
}
implements {
class.constructor;
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index f5b8626..e0d5b8e 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -439,6 +439,7 @@ typedef struct _Elm_Widget_Smart_Data
Eina_Bool focused : 1;
Eina_Bool top_win_focused : 1;
Eina_Bool tree_unfocusable : 1;
+ Eina_Bool focus_move_policy_auto_mode : 1; /* This is TRUE by default */
Eina_Bool highlight_ignore : 1;
Eina_Bool highlight_in_theme : 1;
Eina_Bool access_highlight_in_theme : 1;
@@ -766,8 +767,11 @@ EAPI void elm_widget_focus_highlight_geometry_get(const Evas_Object
void _elm_widget_item_highlight_in_theme(Evas_Object *obj, Elm_Object_Item *it);
EAPI void elm_widget_focus_move_policy_set(Evas_Object *obj, Elm_Focus_Move_Policy policy);
EAPI Elm_Focus_Move_Policy elm_widget_focus_move_policy_get(const Evas_Object *obj);
+EAPI Eina_Bool elm_widget_focus_move_policy_automatic_get(const Evas_Object *obj);
+EAPI void elm_widget_focus_move_policy_automatic_set(Evas_Object *obj, Eina_Bool automatic);
EAPI void elm_widget_focus_region_show_mode_set(Evas_Object *obj, Elm_Focus_Region_Show_Mode mode);
EAPI Elm_Focus_Region_Show_Mode elm_widget_focus_region_show_mode_get(const Evas_Object *obj);
+EAPI void elm_widget_focus_reconfigure(Evas_Object *obj);
/**
* Function to operate on a given widget's scrollabe children when necessary.
diff --git a/src/lib/elm_widget_container.h b/src/lib/elm_widget_container.h
index a8cde24..f62095a 100644
--- a/src/lib/elm_widget_container.h
+++ b/src/lib/elm_widget_container.h
@@ -38,4 +38,8 @@
#include "elm_container.eo.h"
+/**
+ * @}
+ */
+
#endif
diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h
index ef2edef..d5ef440 100644
--- a/src/lib/elm_widget_flipselector.h
+++ b/src/lib/elm_widget_flipselector.h
@@ -86,4 +86,8 @@ struct _Elm_Flipselector_Item_Data
if (EINA_UNLIKELY(!eo_isa((it->base->eo_obj), ELM_FLIPSELECTOR_ITEM_CLASS))) \
return __VA_ARGS__;
+/**
+ * @}
+ */
+
#endif
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 138e112..f903154 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2547,6 +2547,16 @@ _elm_win_translate(void)
elm_widget_translate(obj);
}
+void
+_elm_win_focus_reconfigure(void)
+{
+ const Eina_List *l;
+ Evas_Object *obj;
+
+ EINA_LIST_FOREACH(_elm_win_list, l, obj)
+ elm_widget_focus_reconfigure(obj);
+}
+
#ifdef HAVE_ELEMENTARY_X
static Eina_Bool
_elm_win_client_message(void *data,
@@ -3231,16 +3241,14 @@ elm_win_add(Evas_Object *parent,
const char *name,
Elm_Win_Type type)
{
- Evas_Object *obj = NULL;
- eo_add(&obj, MY_CLASS, parent, elm_obj_win_name_set(obj, name), elm_obj_win_type_set(obj, type));
+ Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_name_set(eo_self, name), elm_obj_win_type_set(eo_self, type));
return obj;
}
EAPI Evas_Object *
elm_win_fake_add(Ecore_Evas *ee)
{
- Eo *ret = NULL;
- return eo_add(&ret, MY_CLASS, NULL, elm_obj_win_fake_canvas_set(ret, ee), elm_obj_win_name_set(ret, NULL), elm_obj_win_type_set(ret, ELM_WIN_FAKE));
+ return eo_add(MY_CLASS, NULL, elm_obj_win_fake_canvas_set(eo_self, ee), elm_obj_win_name_set(eo_self, NULL), elm_obj_win_type_set(eo_self, ELM_WIN_FAKE));
}
static void
diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index 28f4c09..7720b98 100644
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -1,5 +1,5 @@
/**
- * @defgroup Win Win
+ * @defgroup Elm_Win Win
* @ingroup Elementary
*
* @image html win_inheritance_tree.png
diff --git a/src/lib/elm_win_common.h b/src/lib/elm_win_common.h
index 02d8bd4..a0d4fef 100644
--- a/src/lib/elm_win_common.h
+++ b/src/lib/elm_win_common.h
@@ -1,5 +1,5 @@
/**
- * @addtogroup Win
+ * @addtogroup Elm_Win
*
* @{
*/
diff --git a/src/lib/elm_win_eo.h b/src/lib/elm_win_eo.h
index 3a43757..30c2bba 100644
--- a/src/lib/elm_win_eo.h
+++ b/src/lib/elm_win_eo.h
@@ -1,5 +1,5 @@
/**
- * @ingroup Win
+ * @ingroup Elm_Win
*
* @{
*/
diff --git a/src/lib/elm_win_legacy.h b/src/lib/elm_win_legacy.h
index 2362ac6..e6f70b6 100644
--- a/src/lib/elm_win_legacy.h
+++ b/src/lib/elm_win_legacy.h
@@ -14,7 +14,7 @@
*
* @return The created object, or @c NULL on failure
*
- * @ingroup Win
+ * @ingroup Elm_Win
*/
EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
@@ -31,7 +31,7 @@ EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, El
*
* @return The created object, or @c NULL on failure
*
- * @ingroup Win
+ * @ingroup Elm_Win
*
* @since 1.13
*/
@@ -52,7 +52,7 @@ EAPI Evas_Object *elm_win_fake_add(Ecore_Evas *ee);
*
* @see elm_win_add()
*
- * @ingroup Win
+ * @ingroup Elm_Win
*/
EAPI Evas_Object *elm_win_util_standard_add(const char *name, const char *title);
@@ -73,7 +73,7 @@ EAPI Evas_Object *elm_win_util_standard_add(const char *name, const cha
*
* @see elm_win_add()
*
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.13
*/
EAPI Evas_Object *elm_win_util_dialog_add(Evas_Object *parent, const char *name, const char *title);
@@ -90,7 +90,7 @@ EAPI Evas_Object *elm_win_util_dialog_add(Evas_Object *parent, const ch
* a multi window concept in a mobile phone. The way of handling floating mode
* window is decided by enlightenment window manager.
*
- * @ingroup Win
+ * @ingroup Elm_Win
* @see elm_win_floating_mode_get()
* @since 1.8
*/
@@ -102,7 +102,7 @@ EAPI void elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool
* @param obj The window object
* @return If true, the window is floating mode
*
- * @ingroup Win
+ * @ingroup Elm_Win
* @see elm_win_floating_mode_set()
* @since 1.8
*/
@@ -129,7 +129,7 @@ EAPI Eina_Bool elm_win_floating_mode_get(const Evas_Object *obj);
* @see elm_win_norender_pop()
* @see elm_win_norender_get()
* @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.7
*/
EAPI void elm_win_norender_push(Evas_Object *obj);
@@ -145,7 +145,7 @@ EAPI void elm_win_norender_push(Evas_Object *obj);
* @see elm_win_norender_push()
* @see elm_win_norender_get()
* @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.7
*/
EAPI void elm_win_norender_pop(Evas_Object *obj);
@@ -158,7 +158,7 @@ EAPI void elm_win_norender_pop(Evas_Object *obj);
* @see elm_win_norender_push()
* @see elm_win_norender_pop()
* @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.7
*/
EAPI int elm_win_norender_get(const Evas_Object *obj);
@@ -177,7 +177,7 @@ EAPI int elm_win_norender_get(const Evas_Object *obj);
* @see elm_win_norender_push()
* @see elm_win_norender_pop()
* @see elm_win_norender_get()
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.7
*/
EAPI void elm_win_render(Evas_Object *obj);
@@ -193,7 +193,7 @@ EAPI void elm_win_render(Evas_Object *obj);
*
* @return The Ecore_Wl_Window of @p obj
*
- * @ingroup Win
+ * @ingroup Elm_Win
*/
EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
@@ -208,7 +208,7 @@ EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
*
* @return The Ecore_Win32_Window of @p obj
*
- * @ingroup Win
+ * @ingroup Elm_Win
*
* @since 1.16
*/
@@ -225,7 +225,7 @@ EAPI Ecore_Win32_Window *elm_win_win32_window_get(const Evas_Object *obj);
*
* @see elm_win_wm_rotation_preferred_rotation_get()
*
- * ingroup Win
+ * ingroup Elm_Win
* @since 1.9
*/
EAPI void elm_win_wm_rotation_preferred_rotation_set(const Evas_Object *obj, int rotation);
@@ -238,7 +238,7 @@ EAPI void elm_win_wm_rotation_preferred_rotation_set(const Evas
* @param obj The window object
* @return The Ecore_Window of an Evas_Object
*
- * @ingroup Win
+ * @ingroup Elm_Win
* @since 1.8
* @note Unless you are getting the window id for the purpose of communicating between client<->compositor over dbus,
* this is definitely not the function you are looking for.
diff --git a/src/lib/elm_win_standard.c b/src/lib/elm_win_standard.c
index de0da52..c54e3b0 100644
--- a/src/lib/elm_win_standard.c
+++ b/src/lib/elm_win_standard.c
@@ -19,8 +19,7 @@ _elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
if (!obj)
return NULL;
- Evas_Object *bg = NULL;
- eo_add(&bg, ELM_BG_CLASS, obj);
+ Evas_Object *bg = eo_add(ELM_BG_CLASS, obj);
if (!bg)
{
ERR("Cannot create background.");
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index f0f2954..5db692f 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -537,7 +537,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
* @param cursor the cursor name to be used.
*
* @internal
- * @ingroup Cursors
+ * @ingroup Elm_Cursors
*/
void
elm_object_sub_cursor_set(Evas_Object *eventarea, Evas_Object *owner, const char *cursor)
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index f621e51..dbfe6ad 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -902,7 +902,7 @@ elm_tooltip_theme(Elm_Tooltip *tt)
* given @a data, and @c event_info is NULL.
*
* @internal
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
*/
void
elm_object_sub_tooltip_content_cb_set(Evas_Object *eventarea, Evas_Object *owner, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)
diff --git a/src/modules/access_output/mod.c b/src/modules/access_output/mod.c
index 3f15f32..0dff159 100644
--- a/src/modules/access_output/mod.c
+++ b/src/modules/access_output/mod.c
@@ -121,3 +121,17 @@ out_done_callback_set(void (*func) (void *data), const void *data)
cb_func = func;
cb_data = (void *)data;
}
+
+static Eina_Bool
+_module_init(void)
+{
+ return EINA_TRUE;
+}
+
+static void
+_module_shutdown(void)
+{
+}
+
+EINA_MODULE_INIT(_module_init);
+EINA_MODULE_SHUTDOWN(_module_shutdown);
diff --git a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index b8dc56c..198f095 100644
--- a/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -382,3 +382,17 @@ elm_modapi_shutdown(void *m EINA_UNUSED)
{
return 1; // succeed always
}
+
+static Eina_Bool
+_module_init(void)
+{
+ return EINA_TRUE;
+}
+
+static void
+_module_shutdown(void)
+{
+}
+
+EINA_MODULE_INIT(_module_init);
+EINA_MODULE_SHUTDOWN(_module_shutdown);
diff --git a/src/modules/test_entry/mod.c b/src/modules/test_entry/mod.c
index 025d9b4..d2d5171 100644
--- a/src/modules/test_entry/mod.c
+++ b/src/modules/test_entry/mod.c
@@ -35,3 +35,17 @@ obj_longpress(Evas_Object *obj)
{
printf("longpress: %p\n", obj);
}
+
+static Eina_Bool
+_module_init(void)
+{
+ return EINA_TRUE;
+}
+
+static void
+_module_shutdown(void)
+{
+}
+
+EINA_MODULE_INIT(_module_init);
+EINA_MODULE_SHUTDOWN(_module_shutdown);
diff --git a/src/modules/web/none/elm_web_none.c b/src/modules/web/none/elm_web_none.c
index 74959eb..e98cfe8 100644
--- a/src/modules/web/none/elm_web_none.c
+++ b/src/modules/web/none/elm_web_none.c
@@ -353,4 +353,7 @@ ewm_class_get(void)
return elm_web_none_class_get();
}
+#undef ELM_WEB_CLASS
+#define ELM_WEB_CLASS elm_web_class_get()
+
#include "elm_web_none.eo.c"
diff --git a/src/modules/web/webkit2/elm_web_webkit2.c b/src/modules/web/webkit2/elm_web_webkit2.c
index 4347844..3c89834 100644
--- a/src/modules/web/webkit2/elm_web_webkit2.c
+++ b/src/modules/web/webkit2/elm_web_webkit2.c
@@ -1151,4 +1151,7 @@ ewm_class_get(void)
return elm_web_webkit2_class_get();
}
+#undef ELM_WEB_CLASS
+#define ELM_WEB_CLASS elm_web_class_get()
+
#include "elm_web_webkit2.eo.c"
diff --git a/src/tests/elm_test_atspi.c b/src/tests/elm_test_atspi.c
index f88b5ae..82c1564 100644
--- a/src/tests/elm_test_atspi.c
+++ b/src/tests/elm_test_atspi.c
@@ -29,8 +29,7 @@ START_TEST (elm_atspi_app_obj_name_get)
{
elm_init(0, NULL);
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
ck_assert(root != NULL);
@@ -109,8 +108,7 @@ START_TEST (elm_atspi_role_get)
{
elm_init(0, NULL);
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
Elm_Atspi_Role role;
@@ -151,8 +149,7 @@ START_TEST (elm_atspi_role_name_get)
{
elm_init(0, NULL);
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
const char *ret = NULL;
@@ -169,8 +166,7 @@ START_TEST (elm_atspi_localized_role_name_get)
{
elm_init(0, NULL);
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
const char *ret = NULL;
@@ -187,8 +183,7 @@ START_TEST (elm_atspi_description_set)
{
elm_init(0, NULL);
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
const char *ret = NULL;
@@ -234,8 +229,7 @@ START_TEST (elm_atspi_children_and_parent)
elm_init(0, NULL);
generate_app();
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
Eina_List *child_list = NULL;
@@ -262,8 +256,7 @@ START_TEST (elm_atspi_children_and_parent2)
elm_init(0, NULL);
generate_app();
- Eo* root = NULL;
- eo_add(&root, ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = eo_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
Eo *win = NULL;