Index: src/bin/test_box.c
===================================================================
--- src/bin/test_box.c	(revision 68141)
+++ src/bin/test_box.c	(working copy)
@@ -3,6 +3,15 @@
 # include "elementary_config.h"
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
+
+typedef enum
+{
+  BOX_PACK_POSITION_START,
+  BOX_PACK_POSITION_BEFORE,
+  BOX_PACK_POSITION_AFTER,
+  BOX_PACK_POSITION_END
+} _Box_Pack_Position;
+
 void
 test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -170,6 +179,309 @@ test_box_horiz(void *data __UNUSED__, Evas_Object
    evas_object_show(win);
 }
 
+static void
+_unpack_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box, *radio;
+   Eina_List *rl, *l;
+   int value, svalue;
+
+   box = (Evas_Object *)data;
+
+   rl = (Eina_List *) evas_object_data_get(box, "radio-list");
+   EINA_LIST_FOREACH(rl, l, radio)
+     {
+        value = elm_radio_value_get(radio);
+        svalue = elm_radio_state_value_get(radio);
+
+        if (value != svalue) continue;
+
+        elm_radio_value_set(radio, -1);
+        elm_box_unpack(box, radio);
+        rl = eina_list_remove(rl, radio);
+        evas_object_data_set(box, "radio-list", rl);
+        evas_object_del(radio);
+     }
+}
+
+static void
+_unpack_all_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box, *radio;
+   Eina_List *rl, *l;
+
+   box = (Evas_Object *)data;
+   elm_box_unpack_all(box);
+
+   rl = (Eina_List *) evas_object_data_get(box, "radio-list");
+   EINA_LIST_FOREACH(rl, l, radio) evas_object_del(radio);
+
+   evas_object_data_del(box, "radio-list");
+   eina_list_free(rl);
+}
+
+static Evas_Object *
+_radio_new(Evas_Object *obj, int index)
+{
+   Evas_Object *ic, *rd;
+   char buf[PATH_MAX];
+
+   ic = elm_icon_add(obj);
+   snprintf(buf, sizeof(buf), "%s/images/icon_0%d.png",
+            elm_app_data_dir_get(), index);
+   elm_icon_file_set(ic, buf, NULL);
+   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+
+   rd = elm_radio_add(obj);
+   elm_radio_state_value_set(rd, index);
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5);
+   elm_object_part_content_set(rd, "icon", ic);
+
+   evas_object_show(rd);
+   evas_object_show(ic);
+
+   return rd;
+}
+
+static void
+_pack(Evas_Object *box, _Box_Pack_Position pos)
+{
+   Evas_Object *radio;
+   Evas_Object *rd, *rdg = NULL;
+   Eina_List *rl, *l = NULL;
+   int value, svalue, count;
+
+   rl = (Eina_List *) evas_object_data_get(box, "radio-list");
+   if (!rl && ((pos == BOX_PACK_POSITION_START) ||
+               (pos == BOX_PACK_POSITION_END)))
+     {
+        rd = _radio_new(box, 0);
+        if (pos == BOX_PACK_POSITION_START) elm_box_pack_start(box, rd);
+        else elm_box_pack_end(box, rd);
+
+        l = eina_list_append(l, rd);
+        evas_object_data_set(box, "radio-list", l);
+
+        rdg = rd;
+        evas_object_data_set(box, "radio-group", rdg);
+
+        return;
+      }
+
+   count = eina_list_count(rl);
+   EINA_LIST_FOREACH(rl, l, radio)
+     {
+        value = elm_radio_value_get(radio);
+        svalue = elm_radio_state_value_get(radio);
+
+        if (value != svalue) continue;
+
+        rd = _radio_new(box, count);
+
+       switch (pos)
+         {
+          case BOX_PACK_POSITION_START:
+             elm_box_pack_start(box, rd);
+             break;
+          case BOX_PACK_POSITION_BEFORE:
+             elm_box_pack_before(box, rd, radio);
+             break;
+          case BOX_PACK_POSITION_AFTER:
+             elm_box_pack_after(box, rd, radio);
+             break;
+          case BOX_PACK_POSITION_END:
+             elm_box_pack_end(box, rd);
+             break;
+         }
+
+        rdg = evas_object_data_get(box, "radio-group");
+        elm_radio_group_add(rd, rdg);
+
+        rl = eina_list_append(rl, rd);
+        evas_object_data_set(box, "radio-list", rl);
+     }
+}
+
+static void
+_pack_start_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box;
+   if (!data) return;
+
+   box = (Evas_Object *)data;
+   _pack(box, BOX_PACK_POSITION_START);
+}
+
+static void
+_pack_before_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box;
+   if (!data) return;
+
+   box = (Evas_Object *)data;
+   _pack(box, BOX_PACK_POSITION_BEFORE);
+}
+
+static void
+_pack_after_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box;
+   if (!data) return;
+
+   box = (Evas_Object *)data;
+   _pack(box, BOX_PACK_POSITION_AFTER);
+}
+
+static void
+_pack_end_btn_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *box;
+   if (!data) return;
+
+   box = (Evas_Object *)data;
+   _pack(box, BOX_PACK_POSITION_END);
+}
+
+void
+test_box_pack(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win;
+   Evas_Object *box, *lbox, *rbox;
+   Evas_Object *sc;
+   Evas_Object *bt;
+   Evas_Object *rd, *rdg = NULL;
+   Eina_List *l = NULL;
+   int i;
+
+   win = elm_win_util_standard_add("box-pack", "Box Pack");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   box = elm_box_add(win);
+   elm_box_horizontal_set(box, EINA_TRUE);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_win_resize_object_add(win, box);
+   evas_object_show(box);
+
+   // left side
+   lbox = elm_box_add(win);
+   evas_object_size_hint_weight_set(lbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(lbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   sc = elm_scroller_add(win);
+   elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   for(i = 0; i < 3; i++)
+   {
+      rd = _radio_new(win, i);
+      elm_box_pack_end(lbox, rd);
+      l = eina_list_append(l, rd);
+      if (i == 0) rdg = rd;
+      else elm_radio_group_add(rd, rdg);
+   }
+
+   evas_object_data_set(lbox, "radio-list", l);
+   evas_object_data_set(lbox, "radio-group", rdg);
+   elm_object_content_set(sc, lbox);
+   evas_object_show(lbox);
+   elm_box_pack_end(box, sc);
+   evas_object_show(sc);
+
+   // right side
+   rbox = elm_box_add(win);
+   evas_object_size_hint_weight_set(rbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(rbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(rbox);
+   elm_box_pack_end(box, rbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Pack Start");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _pack_start_btn_cb, lbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Pack Before");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _pack_before_btn_cb, lbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Pack After");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _pack_after_btn_cb, lbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Pack End");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _pack_end_btn_cb, lbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Unpack");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _unpack_btn_cb, lbox);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Unpack All");
+   evas_object_show(bt);
+   elm_box_pack_end(rbox, bt);
+   evas_object_smart_callback_add(bt, "clicked", _unpack_all_btn_cb, lbox);
+
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
+static void
+_cb_check_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
+{
+   Eina_Bool homo;
+   Evas_Object *box = data;
+
+   homo = elm_check_state_get(obj);
+   elm_box_homogeneous_set(box, homo);
+}
+
+void
+test_box_homo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win;
+   Evas_Object *box, *o_bg;
+   Evas_Object *rd;
+   char buf[PATH_MAX];
+
+   win = elm_win_util_standard_add("box-homogeneous", "Box Homogeneous");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   box = elm_box_add(win);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, box);
+   evas_object_show(box);
+
+   o_bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/twofish.jpg", elm_app_data_dir_get());
+   elm_bg_file_set(o_bg, buf, NULL);
+   evas_object_size_hint_weight_set(o_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(o_bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(box, o_bg);
+
+   rd = elm_check_add(win);
+   elm_object_text_set(rd, "Homogeneous");
+   evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_FILL);
+   evas_object_smart_callback_add(rd, "changed", _cb_check_changed, box);
+   elm_box_pack_end(box, rd);
+   evas_object_show(rd);
+   evas_object_show(o_bg);
+
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
 typedef struct
 {
    Eina_List *transitions;
@@ -221,7 +533,6 @@ test_box_transition(void *data __UNUSED__, Evas_Ob
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
    evas_object_size_hint_weight_set(bx, 1.0, 1.0);
-
    evas_object_show(bx);
 
    bt = elm_button_add(win);