summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2015-01-19 12:56:50 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2015-01-19 12:56:50 +0100
commitcd1f68eb67b774965453abd1600383648a2a870a (patch)
tree636be04ce644cadb6fcb7dc675e6bda129bf0066
parentf9af4afbd3cb19e839b8d1b495e120730bd75105 (diff)
Revert "genlist: added reorder feature on key events"
This reverts commit f99be3a1d6bdc63153598b592b5437c33da44bf0. The API is not ready to be released. Please see the thread on the e-devel mailing list under this subject. This can get another try in the 1.14 release cycle. Conflicts: src/lib/elm_genlist.c
-rw-r--r--src/bin/test_genlist.c141
-rw-r--r--src/lib/elm_genlist.c144
-rw-r--r--src/lib/elm_genlist.h7
-rw-r--r--src/lib/elm_genlist_legacy.h30
-rw-r--r--src/lib/elm_widget_genlist.h9
5 files changed, 5 insertions, 326 deletions
diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 4953bfc62..c5a10743d 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -5,8 +5,6 @@
5#endif 5#endif
6#include <Elementary.h> 6#include <Elementary.h>
7 7
8static int tween_mode_val;
9
10Evas_Object * _elm_min_set(Evas_Object *obj, Evas_Object *parent, 8Evas_Object * _elm_min_set(Evas_Object *obj, Evas_Object *parent,
11 Evas_Coord w, Evas_Coord h); 9 Evas_Coord w, Evas_Coord h);
12 10
@@ -2096,44 +2094,6 @@ _reorder_tg_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSE
2096 elm_genlist_reorder_mode_set(data, elm_check_state_get(obj)); 2094 elm_genlist_reorder_mode_set(data, elm_check_state_get(obj));
2097} 2095}
2098 2096
2099static void
2100_focus_highlight_ck_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
2101{
2102 elm_win_focus_highlight_enabled_set(data, elm_check_state_get(obj));
2103}
2104
2105static void
2106_tween_mode_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
2107{
2108 switch (tween_mode_val)
2109 {
2110 case 1:
2111 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_LINEAR);
2112 break;
2113 case 2:
2114 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_ACCELERATE);
2115 break;
2116 case 3:
2117 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_DECELERATE);
2118 break;
2119 case 4:
2120 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_SINUSOIDAL);
2121 break;
2122 case 5:
2123 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_DIVISOR_INTERP);
2124 break;
2125 case 6:
2126 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_BOUNCE);
2127 break;
2128 case 7:
2129 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_SPRING);
2130 break;
2131 default:
2132 elm_genlist_reorder_mode_start(data, ECORE_POS_MAP_LINEAR);
2133 break;
2134 }
2135}
2136
2137/** 2097/**
2138 * gl_moved is called after an item was reordered. 2098 * gl_moved is called after an item was reordered.
2139 * This is only called when reorder mode is enabled. 2099 * This is only called when reorder mode is enabled.
@@ -2191,12 +2151,11 @@ static void gl_moved_before(Evas_Object *data EINA_UNUSED, Evas_Object *obj EINA
2191void 2151void
2192test_genlist11(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 2152test_genlist11(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
2193{ 2153{
2194 Evas_Object *win, *fr, *lb, *bx, *tg, *gl, *hbx, *ck, *grp, *rd; 2154 Evas_Object *win, *fr, *lb, *bx, *tg, *gl;
2195 int i; 2155 int i;
2196 2156
2197 api_data *api = calloc(1, sizeof(api_data)); 2157 api_data *api = calloc(1, sizeof(api_data));
2198 win = elm_win_util_standard_add("genlist-reorder-mode", "Genlist Reorder Mode"); 2158 win = elm_win_util_standard_add("genlist-reorder-mode", "Genlist Reorder Mode");
2199 elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
2200 elm_win_autodel_set(win, EINA_TRUE); 2159 elm_win_autodel_set(win, EINA_TRUE);
2201 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); 2160 evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
2202 2161
@@ -2224,116 +2183,20 @@ test_genlist11(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
2224 api->gl = gl; 2183 api->gl = gl;
2225 evas_object_show(gl); 2184 evas_object_show(gl);
2226 2185
2227 hbx = elm_box_add(win);
2228 elm_box_horizontal_set(hbx, EINA_TRUE);
2229 evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, 0);
2230 elm_box_padding_set(hbx, 20, 0);
2231 elm_box_pack_end(bx, hbx);
2232 evas_object_show(hbx);
2233
2234 tg = elm_check_add(win); 2186 tg = elm_check_add(win);
2235 elm_object_style_set(tg, "toggle"); 2187 elm_object_style_set(tg, "toggle");
2236 elm_object_text_set(tg, "Reorder Mode:"); 2188 elm_object_text_set(tg, "Reorder Mode:");
2237 elm_check_state_set(tg, elm_config_mirrored_get()); 2189 elm_check_state_set(tg, elm_config_mirrored_get());
2238 evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl); 2190 evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl);
2239 elm_box_pack_end(hbx, tg); 2191 elm_box_pack_end(bx, tg);
2240 evas_object_show(tg); 2192 evas_object_show(tg);
2241 2193
2242 ck = elm_check_add(win);
2243 elm_object_text_set(ck, "Focus Highlight");
2244 elm_check_state_set(ck, elm_win_focus_highlight_enabled_get(win));
2245 evas_object_smart_callback_add(ck, "changed", _focus_highlight_ck_changed_cb, win);
2246 elm_box_pack_end(hbx, ck);
2247 evas_object_show(ck);
2248
2249 lb = elm_label_add(win);
2250 elm_object_text_set(lb, "Select reorder tween mode:");
2251 elm_box_pack_end(bx, lb);
2252 evas_object_show(lb);
2253
2254 hbx = elm_box_add(win);
2255 elm_box_horizontal_set(hbx, EINA_TRUE);
2256 evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, 0);
2257 elm_box_pack_end(bx, hbx);
2258 evas_object_show(hbx);
2259
2260 grp = rd = elm_radio_add(win);
2261 elm_object_text_set(rd, "Linear");
2262 elm_radio_state_value_set(rd, 1);
2263 elm_radio_value_pointer_set(rd, &tween_mode_val);
2264 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2265 elm_box_pack_end(hbx, rd);
2266 evas_object_show(rd);
2267
2268 rd = elm_radio_add(win);
2269 elm_object_text_set(rd, "Accelerate");
2270 elm_radio_state_value_set(rd, 2);
2271 elm_radio_value_pointer_set(rd, &tween_mode_val);
2272 elm_radio_group_add(rd, grp);
2273 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2274 elm_box_pack_end(hbx, rd);
2275 evas_object_show(rd);
2276
2277 rd = elm_radio_add(win);
2278 elm_object_text_set(rd, "Decelerate");
2279 elm_radio_state_value_set(rd, 3);
2280 elm_radio_value_pointer_set(rd, &tween_mode_val);
2281 elm_radio_group_add(rd, grp);
2282 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2283 elm_box_pack_end(hbx, rd);
2284 evas_object_show(rd);
2285
2286 rd = elm_radio_add(win);
2287 elm_object_text_set(rd, "Sinusoidal");
2288 elm_radio_state_value_set(rd, 4);
2289 elm_radio_value_pointer_set(rd, &tween_mode_val);
2290 elm_radio_group_add(rd, grp);
2291 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2292 elm_box_pack_end(hbx, rd);
2293 evas_object_show(rd);
2294
2295 hbx = elm_box_add(win);
2296 elm_box_horizontal_set(hbx, EINA_TRUE);
2297 evas_object_size_hint_weight_set(hbx, EVAS_HINT_EXPAND, 0);
2298 elm_box_pack_end(bx, hbx);
2299 evas_object_show(hbx);
2300
2301 rd = elm_radio_add(win);
2302 elm_object_text_set(rd, "Divisor Interpolation");
2303 elm_radio_state_value_set(rd, 5);
2304 elm_radio_value_pointer_set(rd, &tween_mode_val);
2305 elm_radio_group_add(rd, grp);
2306 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2307 elm_box_pack_end(hbx, rd);
2308 evas_object_show(rd);
2309
2310 rd = elm_radio_add(win);
2311 elm_object_text_set(rd, "Bounce");
2312 elm_radio_state_value_set(rd, 6);
2313 elm_radio_value_pointer_set(rd, &tween_mode_val);
2314 elm_radio_group_add(rd, grp);
2315 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2316 elm_box_pack_end(hbx, rd);
2317 evas_object_show(rd);
2318
2319 rd = elm_radio_add(win);
2320 elm_object_text_set(rd, "Spring");
2321 elm_radio_state_value_set(rd, 7);
2322 elm_radio_value_pointer_set(rd, &tween_mode_val);
2323 elm_radio_group_add(rd, grp);
2324 evas_object_smart_callback_add(rd, "changed", _tween_mode_changed_cb, gl);
2325 elm_box_pack_end(hbx, rd);
2326 evas_object_show(rd);
2327
2328 elm_radio_value_set(grp, 1);
2329
2330 api->itc1 = elm_genlist_item_class_new(); 2194 api->itc1 = elm_genlist_item_class_new();
2331 api->itc1->item_style = "default"; 2195 api->itc1->item_style = "default";
2332 api->itc1->func.text_get = gl_text_get; 2196 api->itc1->func.text_get = gl_text_get;
2333 api->itc1->func.content_get = gl_content_get; 2197 api->itc1->func.content_get = gl_content_get;
2334 api->itc1->func.state_get = gl_state_get; 2198 api->itc1->func.state_get = gl_state_get;
2335 api->itc1->func.del = NULL; 2199 api->itc1->func.del = NULL;
2336
2337 evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl); 2200 evas_object_smart_callback_add(gl, "moved", (Evas_Smart_Cb)gl_moved, gl);
2338 evas_object_smart_callback_add(gl, "moved,after", (Evas_Smart_Cb)gl_moved_after, gl); 2201 evas_object_smart_callback_add(gl, "moved,after", (Evas_Smart_Cb)gl_moved_after, gl);
2339 evas_object_smart_callback_add(gl, "moved,before", (Evas_Smart_Cb)gl_moved_before, gl); 2202 evas_object_smart_callback_add(gl, "moved,before", (Evas_Smart_Cb)gl_moved_before, gl);
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index fd8048263..e242f8222 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -91,9 +91,7 @@
91 cmd(SIG_ITEM_FOCUSED, "item,focused", "") \ 91 cmd(SIG_ITEM_FOCUSED, "item,focused", "") \
92 cmd(SIG_ITEM_UNFOCUSED, "item,unfocused", "") \ 92 cmd(SIG_ITEM_UNFOCUSED, "item,unfocused", "") \
93 cmd(SIG_PRESSED, "pressed", "") \ 93 cmd(SIG_PRESSED, "pressed", "") \
94 cmd(SIG_RELEASED, "released", "") \ 94 cmd(SIG_RELEASED, "released", "")
95 cmd(SIG_ITEM_REORDER_START, "item,reorder,anim,start", "") \
96 cmd(SIG_ITEM_REORDER_STOP, "item,reorder,anim,stop", "")
97 95
98ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE); 96ELM_PRIV_GENLIST_SIGNALS(ELM_PRIV_STATIC_VARIABLE_DECLARE);
99 97
@@ -146,8 +144,6 @@ static Eina_Bool _item_select(Elm_Gen_Item *it);
146static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 144static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
147static Eina_Bool _key_action_select(Evas_Object *obj, const char *params); 145static Eina_Bool _key_action_select(Evas_Object *obj, const char *params);
148static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); 146static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
149static void _item_move_after(Elm_Gen_Item *it, Elm_Gen_Item *after);
150static void _item_move_before(Elm_Gen_Item *it, Elm_Gen_Item *before);
151static void _calc_job(void *data); 147static void _calc_job(void *data);
152static Eina_Bool _item_block_recalc(Item_Block *itb, int in, Eina_Bool qadd); 148static Eina_Bool _item_block_recalc(Item_Block *itb, int in, Eina_Bool qadd);
153static void _item_mouse_callbacks_add(Elm_Gen_Item *it, Evas_Object *view); 149static void _item_mouse_callbacks_add(Elm_Gen_Item *it, Evas_Object *view);
@@ -2755,101 +2751,6 @@ _key_action_move_dir(Evas_Object *obj, Elm_Focus_Direction dir, Eina_Bool multi)
2755 return EINA_FALSE; 2751 return EINA_FALSE;
2756} 2752}
2757 2753
2758static void
2759_anim_end(Elm_Genlist_Data *sd)
2760{
2761 if (sd->reorder.dir == ELM_FOCUS_UP)
2762 _item_move_after(sd->reorder.it2, sd->reorder.it1);
2763 else if (sd->reorder.dir == ELM_FOCUS_DOWN)
2764 _item_move_after(sd->reorder.it1, sd->reorder.it2);
2765
2766 ecore_job_del(sd->calc_job);
2767 sd->calc_job = ecore_job_add(_calc_job, sd->obj);
2768}
2769
2770static Eina_Bool
2771_item_swap_cb(void *data, double pos)
2772{
2773 Elm_Genlist_Data *sd = data;
2774 double frame = pos;
2775 Evas_Coord xx1, yy1, xx2, yy2;
2776 double dx, dy;
2777
2778 switch (sd->reorder.tween_mode)
2779 {
2780 case ECORE_POS_MAP_LINEAR:
2781 frame = ecore_animator_pos_map(frame, sd->reorder.tween_mode, 0, 0);
2782 break;
2783 case ECORE_POS_MAP_ACCELERATE:
2784 case ECORE_POS_MAP_DECELERATE:
2785 case ECORE_POS_MAP_SINUSOIDAL:
2786 frame = ecore_animator_pos_map(frame, sd->reorder.tween_mode, 1.0, 0);
2787 break;
2788 case ECORE_POS_MAP_DIVISOR_INTERP:
2789 case ECORE_POS_MAP_BOUNCE:
2790 case ECORE_POS_MAP_SPRING:
2791 frame = ecore_animator_pos_map(frame, sd->reorder.tween_mode, 1.0, 1.0);
2792 break;
2793 default:
2794 // use ECORE_POS_MAP_LINEAR as default tween mode
2795 frame = ecore_animator_pos_map(frame, sd->reorder.tween_mode, 0, 0);
2796 break;
2797 }
2798
2799 dx = sd->reorder.x2 - sd->reorder.x1;
2800 dy = sd->reorder.y2 - sd->reorder.y1;
2801
2802 xx1 = sd->reorder.x1 + (dx * frame);
2803 yy1 = sd->reorder.y1 + (dy * frame);
2804 xx2 = sd->reorder.x2 - (dx * frame);
2805 yy2 = sd->reorder.y2 - (dy * frame);
2806
2807 evas_object_move(VIEW(sd->reorder.it2), xx2, yy2);
2808 evas_object_move(VIEW(sd->reorder.it1), xx1, yy1);
2809
2810 if (pos == 1.0)
2811 {
2812 elm_genlist_item_bring_in((Elm_Object_Item *)sd->reorder.it2, ELM_GENLIST_ITEM_SCROLLTO_IN);
2813 _anim_end(sd);
2814 evas_object_smart_callback_call(sd->obj, SIG_ITEM_REORDER_STOP,
2815 EO_OBJ(sd->reorder.it1));
2816 evas_object_smart_callback_call(sd->obj, SIG_MOVED, EO_OBJ(sd->reorder.it1));
2817 sd->reorder.running = EINA_FALSE;
2818 }
2819
2820 _elm_widget_focus_highlight_start(sd->obj);
2821
2822 return EINA_TRUE;
2823}
2824
2825
2826static void
2827_swap_items(Elm_Gen_Item *it1, Elm_Gen_Item *it2, Elm_Focus_Direction dir)
2828{
2829 if (!it1 || !it2) return;
2830
2831 ELM_GENLIST_DATA_GET_FROM_ITEM(it1, sd);
2832 Evas_Coord xx1, yy1, xx2, yy2;
2833
2834 sd->reorder.running = EINA_TRUE;
2835 sd->reorder.dir = dir;
2836 sd->reorder.it1 = it1;
2837 sd->reorder.it2 = it2;
2838
2839 evas_object_geometry_get(VIEW(it1), &xx1, &yy1, NULL, NULL);
2840 evas_object_geometry_get(VIEW(it2), &xx2, &yy2, NULL, NULL);
2841 sd->reorder.x1 = xx1;
2842 sd->reorder.y1 = yy1;
2843 sd->reorder.x2 = xx2;
2844 sd->reorder.y2 = yy2;
2845
2846 evas_object_raise(VIEW(it1));
2847 evas_object_smart_callback_call(sd->obj, SIG_ITEM_REORDER_START,
2848 EO_OBJ(sd->reorder.it1));
2849 //TODO: Add elm config for time
2850 ecore_animator_timeline_add(0.3, _item_swap_cb, sd);
2851}
2852
2853static Eina_Bool 2754static Eina_Bool
2854_key_action_move(Evas_Object *obj, const char *params) 2755_key_action_move(Evas_Object *obj, const char *params)
2855{ 2756{
@@ -2896,18 +2797,6 @@ _key_action_move(Evas_Object *obj, const char *params)
2896 } 2797 }
2897 else if (!strcmp(dir, "up")) 2798 else if (!strcmp(dir, "up"))
2898 { 2799 {
2899 if (sd->reorder.running) return EINA_TRUE;
2900 if (sd->reorder_mode)
2901 {
2902 Elm_Object_Item *up = elm_genlist_item_prev_get(sd->focused_item);
2903 ELM_GENLIST_ITEM_DATA_GET(sd->focused_item, focused_it);
2904 ELM_GENLIST_ITEM_DATA_GET(up, up2);
2905
2906 _swap_items(focused_it, up2, ELM_FOCUS_UP);
2907
2908 return EINA_TRUE;
2909 }
2910
2911 if (_key_action_move_dir(obj, ELM_FOCUS_UP, EINA_FALSE)) return EINA_TRUE; 2800 if (_key_action_move_dir(obj, ELM_FOCUS_UP, EINA_FALSE)) return EINA_TRUE;
2912 else return EINA_FALSE; 2801 else return EINA_FALSE;
2913 } 2802 }
@@ -2919,18 +2808,6 @@ _key_action_move(Evas_Object *obj, const char *params)
2919 } 2808 }
2920 else if (!strcmp(dir, "down")) 2809 else if (!strcmp(dir, "down"))
2921 { 2810 {
2922 if (sd->reorder.running) return EINA_TRUE;
2923 if (sd->reorder_mode)
2924 {
2925 Elm_Object_Item *down = elm_genlist_item_next_get(sd->focused_item);
2926 ELM_GENLIST_ITEM_DATA_GET(sd->focused_item, focused_it);
2927 ELM_GENLIST_ITEM_DATA_GET(down, down2);
2928
2929 _swap_items(focused_it, down2, ELM_FOCUS_DOWN);
2930
2931 return EINA_TRUE;
2932 }
2933
2934 if (_key_action_move_dir(obj, ELM_FOCUS_DOWN, EINA_FALSE)) return EINA_TRUE; 2811 if (_key_action_move_dir(obj, ELM_FOCUS_DOWN, EINA_FALSE)) return EINA_TRUE;
2935 else return EINA_FALSE; 2812 else return EINA_FALSE;
2936 } 2813 }
@@ -7415,25 +7292,6 @@ _elm_genlist_reorder_mode_set(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Eina_Bo
7415 } 7292 }
7416} 7293}
7417 7294
7418EAPI void
7419elm_genlist_reorder_mode_start(Evas_Object *obj, Ecore_Pos_Map tween_mode)
7420{
7421 ELM_GENLIST_CHECK(obj);
7422 ELM_GENLIST_DATA_GET(obj, sd);
7423
7424 sd->reorder.tween_mode = tween_mode;
7425 _elm_genlist_reorder_mode_set(obj, sd, EINA_TRUE);
7426}
7427
7428EAPI void
7429elm_genlist_reorder_mode_stop(Evas_Object *obj)
7430{
7431 ELM_GENLIST_CHECK(obj);
7432 ELM_GENLIST_DATA_GET(obj, sd);
7433
7434 _elm_genlist_reorder_mode_set(obj, sd, EINA_FALSE);
7435}
7436
7437EOLIAN static Eina_Bool 7295EOLIAN static Eina_Bool
7438_elm_genlist_reorder_mode_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) 7296_elm_genlist_reorder_mode_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd)
7439{ 7297{
diff --git a/src/lib/elm_genlist.h b/src/lib/elm_genlist.h
index 3f1835ee7..d8ee6c4c1 100644
--- a/src/lib/elm_genlist.h
+++ b/src/lib/elm_genlist.h
@@ -382,12 +382,7 @@
382 * - @c "unfocused" - When the genlist has lost focus. (since 1.8) 382 * - @c "unfocused" - When the genlist has lost focus. (since 1.8)
383 * - @c "item,focused" - When the genlist item has recieved focus. (since 1.10) 383 * - @c "item,focused" - When the genlist item has recieved focus. (since 1.10)
384 * - @c "item,unfocused" - When the genlist item has lost focus. (since 1.10) 384 * - @c "item,unfocused" - When the genlist item has lost focus. (since 1.10)
385 * - @c "item,reorder,anim,start" - This is called when a genglist item's movement 385 *
386 has just started by keys in reorder mode. The %c event_info parameter
387 * is the item that is going to move. (since 1.13)
388 * - @c "item,reorder,anim,stop" - This is called when a genlist item's movement just
389 stopped in reorder mode. The %c event_info parameter is the item
390 that was moved. (since 1.13)
391 * 386 *
392 * Supported elm_object_item common APIs 387 * Supported elm_object_item common APIs
393 * @li @ref elm_object_item_part_content_get 388 * @li @ref elm_object_item_part_content_get
diff --git a/src/lib/elm_genlist_legacy.h b/src/lib/elm_genlist_legacy.h
index f8345edb6..77866c074 100644
--- a/src/lib/elm_genlist_legacy.h
+++ b/src/lib/elm_genlist_legacy.h
@@ -31,33 +31,5 @@ EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
31EAPI Elm_Object_Item * 31EAPI Elm_Object_Item *
32elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth); 32elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth);
33 33
34/**
35 * Enable item reorder mode with keys for genlist widget
36 *
37 * @param obj The genlist object
38 * @param tween_mode Position mappings for animation
39 * @see _Ecore_Pos_Map
40 *
41 * @see elm_genlist_reorder_mode_stop()
42 * @since 1.13
43 *
44 * @ingroup Genlist
45 */
46EAPI void
47elm_genlist_reorder_mode_start(Evas_Object *obj, Ecore_Pos_Map tween_mode);
48
49/**
50 * Stop item reorder mode with keys for genlist widget
51 *
52 * @param obj The genlist object
53 *
54 * @see elm_genlist_reorder_mode_start()
55 * @since 1.13
56 *
57 * @ingroup Genlist
58 */
59EAPI void
60elm_genlist_reorder_mode_stop(Evas_Object *obj);
61
62#include "elm_genlist.eo.legacy.h"
63#include "elm_genlist_item.eo.legacy.h" 34#include "elm_genlist_item.eo.legacy.h"
35#include "elm_genlist.eo.legacy.h"
diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index d16c3940e..7d0c9009e 100644
--- a/src/lib/elm_widget_genlist.h
+++ b/src/lib/elm_widget_genlist.h
@@ -137,15 +137,6 @@ struct _Elm_Genlist_Data
137 Elm_Genlist_Item_Move_Effect_Mode move_effect_mode; 137 Elm_Genlist_Item_Move_Effect_Mode move_effect_mode;
138 int reorder_fast; 138 int reorder_fast;
139 139
140 struct
141 {
142 Elm_Gen_Item *it1, *it2; /**< The items which are getting swapped */
143 Elm_Focus_Direction dir; /**< focus key direction */
144 Ecore_Pos_Map tween_mode; /**< Position mappings for animation */
145 Evas_Coord x1, y1, x2, y2; /**< Coordinates of it1 and it2 */
146 Eina_Bool running : 1; /**< animation is happening */
147 } reorder;
148
149 Eina_Bool focus_on_selection_enabled : 1; 140 Eina_Bool focus_on_selection_enabled : 1;
150 Eina_Bool tree_effect_enabled : 1; 141 Eina_Bool tree_effect_enabled : 1;
151 Eina_Bool auto_scroll_enabled : 1; 142 Eina_Bool auto_scroll_enabled : 1;