Resolve the conflict. scroller, conform, gengrid, toolbar, widget.
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 3 Nov 2015 04:26:21 +0000 (13:26 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Tue, 3 Nov 2015 04:36:12 +0000 (13:36 +0900)
Change-Id: I51fe5b257adafdd5962b33b900a43d71eb46a2d4

src/bin/test_scroller.c
src/lib/elm_conform.c
src/lib/elm_gengrid.c
src/lib/elm_interface_scrollable.c
src/lib/elm_macros.h
src/lib/elm_toolbar.c
src/lib/elm_widget.c
src/lib/elm_widget.eo
src/lib/elm_widget_item.eo

index 464e3832d45e0ea383da65447c27854005cb1623..eb00f2594614448e9a53aeb5582a8b490bb6681c 100644 (file)
@@ -130,13 +130,8 @@ _my_bt_block_movements_y_axis(void *data, Evas_Object *obj,
      }
 }
 
-<<<<<<< HEAD
-void
-my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
-=======
 static void
 _my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
->>>>>>> opensource/master
                   void *event_info EINA_UNUSED)
 {
    Eina_Bool loop_h, loop_v;
@@ -146,13 +141,8 @@ _my_bt_loop_x_axis(void *data, Evas_Object *obj EINA_UNUSED,
    elm_scroller_loop_set(scroller, !loop_h, loop_v);
 }
 
-<<<<<<< HEAD
-void
-my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
-=======
 static void
 _my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
->>>>>>> opensource/master
                   void *event_info EINA_UNUSED)
 {
    Eina_Bool loop_h, loop_v;
@@ -162,10 +152,6 @@ _my_bt_loop_y_axis(void *data, Evas_Object *obj EINA_UNUSED,
    elm_scroller_loop_set(scroller, loop_h, !loop_v);
 }
 
-<<<<<<< HEAD
-void
-page_change_cb(void *data EINA_UNUSED,
-=======
 static void
 _my_bt_wheel_disable_cb(void *data, Evas_Object *obj EINA_UNUSED,
                   void *event_info EINA_UNUSED)
@@ -177,7 +163,6 @@ _my_bt_wheel_disable_cb(void *data, Evas_Object *obj EINA_UNUSED,
 
 static void
 _page_change_cb(void *data EINA_UNUSED,
->>>>>>> opensource/master
                Evas_Object *obj,
                void *event_info EINA_UNUSED)
 {
@@ -216,11 +201,7 @@ void
 test_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *win, *bg2, *tb, *tb2, *sc, *bt, *ck1, *ck2, *bx, *bx2, *fr,
-<<<<<<< HEAD
-       *ck3, *ck4, *ck5, *ck6, *ck7;
-=======
        *ck3, *ck4, *ck5, *ck6, *ck7, *ck8;
->>>>>>> opensource/master
    int i, j, n;
    char buf[PATH_MAX];
    Evas_Coord x = 0, y = 0, w = 0, h = 0;
@@ -292,14 +273,11 @@ test_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
    elm_box_pack_end(bx2, ck7);
    evas_object_show(ck7);
 
-<<<<<<< HEAD
-=======
    ck8 = elm_check_add(win);
    elm_object_text_set(ck8, "Wheel Disable");
    elm_box_pack_end(bx2, ck8);
    evas_object_show(ck8);
 
->>>>>>> opensource/master
    sc = elm_scroller_add(win);
    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);
@@ -341,16 +319,10 @@ test_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
                                   sc);
    evas_object_smart_callback_add(ck4, "changed", _my_bt_block_movements_y_axis,
                                   sc);
-<<<<<<< HEAD
-   evas_object_smart_callback_add(ck5, "changed", my_bt_snap_to_pages, sc);
-   evas_object_smart_callback_add(ck6, "changed", my_bt_loop_x_axis, sc);
-   evas_object_smart_callback_add(ck7, "changed", my_bt_loop_y_axis, sc);
-=======
    evas_object_smart_callback_add(ck5, "changed", _my_bt_snap_to_pages, sc);
    evas_object_smart_callback_add(ck6, "changed", _my_bt_loop_x_axis, sc);
    evas_object_smart_callback_add(ck7, "changed", _my_bt_loop_y_axis, sc);
    evas_object_smart_callback_add(ck8, "changed", _my_bt_wheel_disable_cb, sc);
->>>>>>> opensource/master
 
    bt = elm_spinner_add(win);
    elm_spinner_min_max_set(bt, 0, 500);
index ad1b57c154473ae63448f71d8cc6460378197700..5e7ffbbf3934a86787941d6f39d844573368bd94 100644 (file)
@@ -951,22 +951,15 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
 
    evas_object_data_set(sd->win, "\377 elm,conformant", NULL);
 
-<<<<<<< HEAD
-   evas_object_smart_callback_del_full
-     (sd->win, "indicator,prop,changed", _on_indicator_mode_changed, obj);
-   evas_object_smart_callback_del_full
-     (sd->win, "rotation,changed", _on_rotation_changed, obj);
-   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
-   evas_object_smart_callback_del_full
-     (sd->win, "conformant,changed", _on_conformant_changed, obj);
-   //
-=======
    eo_do(sd->win,
          eo_event_callback_del(ELM_WIN_EVENT_INDICATOR_PROP_CHANGED,
             _on_indicator_mode_changed, obj),
          eo_event_callback_del(ELM_WIN_EVENT_ROTATION_CHANGED,
             _on_rotation_changed, obj));
->>>>>>> opensource/master
+   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+   evas_object_smart_callback_del_full
+     (sd->win, "conformant,changed", _on_conformant_changed, obj);
+   //
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
@@ -1007,48 +1000,32 @@ elm_conformant_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
 {
-<<<<<<< HEAD
-   eo_do_super(obj, MY_CLASS, eo_constructor());
-=======
    obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
->>>>>>> opensource/master
    eo_do(obj,
          evas_obj_type_set(MY_CLASS_NAME_LEGACY),
          evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_FILLER));
 
    sd->win = elm_widget_top_get(obj);
-<<<<<<< HEAD
-   _on_indicator_mode_changed(obj, sd->win, NULL);
-   _on_rotation_changed(obj, sd->win, NULL);
-=======
    _on_indicator_mode_changed(obj, sd->win, NULL, NULL);
    _on_rotation_changed(obj, sd->win, NULL, NULL);
->>>>>>> opensource/master
 
    sd->indmode = elm_win_indicator_mode_get(sd->win);
    sd->ind_o_mode = elm_win_indicator_opacity_get(sd->win);
    sd->rot = elm_win_rotation_get(sd->win);
    evas_object_data_set(sd->win, "\377 elm,conformant", obj);
 
-<<<<<<< HEAD
-   evas_object_smart_callback_add
-     (sd->win, "indicator,prop,changed", _on_indicator_mode_changed, obj);
-   evas_object_smart_callback_add
-     (sd->win, "rotation,changed", _on_rotation_changed, obj);
-   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
-   evas_object_smart_callback_add
-     (sd->win, "conformant,changed", _on_conformant_changed, obj);
-   //
-=======
    eo_do(sd->win,
          eo_event_callback_add(ELM_WIN_EVENT_INDICATOR_PROP_CHANGED,
             _on_indicator_mode_changed, obj),
          eo_event_callback_add(ELM_WIN_EVENT_ROTATION_CHANGED,
             _on_rotation_changed, obj));
+   // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+   evas_object_smart_callback_add
+     (sd->win, "conformant,changed", _on_conformant_changed, obj);
+   //
 
    return obj;
->>>>>>> opensource/master
 }
 
 static void
index ea8ec1022e7258280488663446a8eb66eb8ef760..4b872081d5640b478a6a1fff65059731c44e5976 100644 (file)
@@ -1408,21 +1408,7 @@ _item_realize(Elm_Gen_Item *it)
 
    if (eo_it == sd->focused_item)
      {
-<<<<<<< HEAD
-        const char *focus_raise;
-        if (elm_widget_focus_highlight_enabled_get(WIDGET(it)))
-          {
-             edje_object_signal_emit
-                (VIEW(it), "elm,state,focused", "elm");
-          }
-
-        focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-        if ((focus_raise) && (!strcmp(focus_raise, "on")))
-          evas_object_raise(VIEW(it));
-
-=======
         _elm_gengrid_item_focus_update(it);
->>>>>>> opensource/master
         _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it));
         _elm_widget_highlight_in_theme_update(WIDGET(it));
         _elm_widget_focus_highlight_start(WIDGET(it));
@@ -2040,21 +2026,6 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
 
    sd->focused_item = eo_it;
 
-<<<<<<< HEAD
-   if (it->realized)
-     {
-        if (elm_widget_focus_highlight_enabled_get(obj))
-          {
-             edje_object_signal_emit
-                (VIEW(it), "elm,state,focused", "elm");
-          }
-
-        focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-        if ((focus_raise) && (!strcmp(focus_raise, "on")))
-          evas_object_raise(VIEW(it));
-     }
-   evas_object_smart_callback_call(obj, SIG_ITEM_FOCUSED, eo_it);
-=======
    /* If item is not realized state, widget couldn't get focus_highlight data. */
    if (it->realized)
      {
@@ -2065,7 +2036,6 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it)
      }
 
    eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -2095,11 +2065,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it)
      }
 
    sd->focused_item = NULL;
-<<<<<<< HEAD
-   evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
-=======
    eo_do(obj, eo_event_callback_call(ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
 }
@@ -3552,11 +3518,7 @@ _key_action_select(Evas_Object *obj, const char *params)
      }
 
    if (!sd->multi)
-<<<<<<< HEAD
-     evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it);
-=======
      eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_ACTIVATED, eo_it));
->>>>>>> opensource/master
 
    return EINA_TRUE;
 }
@@ -4059,28 +4021,6 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it, Elm_Gen_Item *it, Eina_Bo
              if (sd->focused_item)
                _elm_gengrid_item_unfocused(sd->focused_item);
              _elm_gengrid_item_focused(eo_it);
-<<<<<<< HEAD
-
-             /* If item is not realized state, widget couldn't get focus_highlight data. */
-             if (it->realized)
-               {
-                  const char *focus_raise;
-                  if (elm_widget_focus_highlight_enabled_get(obj))
-                    {
-                       edje_object_signal_emit
-                          (VIEW(it), "elm,state,focused", "elm");
-                    }
-
-                  focus_raise = edje_object_data_get(VIEW(it), "focusraise");
-                  if ((focus_raise) && (!strcmp(focus_raise, "on")))
-                    evas_object_raise(VIEW(it));
-
-                  _elm_widget_item_highlight_in_theme(obj, eo_it);
-                  _elm_widget_highlight_in_theme_update(obj);
-                  _elm_widget_focus_highlight_start(obj);
-               }
-=======
->>>>>>> opensource/master
           }
      }
    else
@@ -4216,11 +4156,8 @@ _elm_gengrid_item_eo_base_constructor(Eo *eo_it, Elm_Gen_Item *it)
    eo_it = eo_do_super_ret(eo_it, ELM_GENGRID_ITEM_CLASS, eo_it, eo_constructor());
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_LIST_ITEM));
-<<<<<<< HEAD
-=======
 
    return eo_it;
->>>>>>> opensource/master
 }
 
 static Elm_Gen_Item *
@@ -4414,11 +4351,8 @@ _elm_gengrid_eo_base_constructor(Eo *obj, Elm_Gengrid_Data *sd)
          evas_obj_type_set(MY_CLASS_NAME_LEGACY),
          evas_obj_smart_callbacks_descriptions_set(_smart_callbacks),
          elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_TREE_TABLE));
-<<<<<<< HEAD
-=======
 
    return obj;
->>>>>>> opensource/master
 }
 
 EOLIAN static void
@@ -5078,11 +5012,7 @@ elm_gengrid_item_cursor_engine_only_get(const Elm_Object_Item *eo_it)
    ELM_GENGRID_ITEM_DATA_GET(eo_it, it);
    Eina_Bool ret;
    if (it->realized)
-<<<<<<< HEAD
-     return eo_do(eo_it, elm_wdg_item_cursor_engine_only_get());
-=======
      return eo_do_ret(eo_it, ret, elm_wdg_item_cursor_engine_only_get());
->>>>>>> opensource/master
    else return it->cursor_engine_only;
 }
 
@@ -5579,19 +5509,6 @@ _elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED,
 
         EINA_LIST_FREE(texts, key)
           {
-<<<<<<< HEAD
-             char *s = it->itc->func.text_get
-                ((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), key);
-
-             s = _elm_util_mkup_to_text(s);
-
-             if (s)
-               {
-                  if (eina_strbuf_length_get(buf) > 0)
-                    eina_strbuf_append(buf, ", ");
-                  eina_strbuf_append(buf, s);
-                  free(s);
-=======
              char *str_markup = it->itc->func.text_get
                 ((void *)WIDGET_ITEM_DATA_GET(EO_OBJ(it)), WIDGET(it), key);
 
@@ -5605,7 +5522,6 @@ _elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED,
                     eina_strbuf_append(buf, ", ");
                   eina_strbuf_append(buf, str_utf8);
                   free(str_utf8);
->>>>>>> opensource/master
                }
           }
      }
@@ -5791,8 +5707,6 @@ _elm_gengrid_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Gengrid_D
    return ret;
 }
 
-<<<<<<< HEAD
-=======
 EOLIAN int
 _elm_gengrid_elm_interface_atspi_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Gengrid_Data *pd)
 {
@@ -5893,6 +5807,5 @@ _elm_gengrid_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, E
    return EINA_FALSE;
 }
 
->>>>>>> opensource/master
 #include "elm_gengrid.eo.c"
 #include "elm_gengrid_item.eo.c"
index 1ae8e190cdb8f43bfc6c04f350d7f9637feead0b..23d0ebba1e6d355d88ee0cea82409adb942d8482 100644 (file)
@@ -1231,20 +1231,11 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
    eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
          (NULL, NULL, &sid->ww, &sid->wh));
 
-<<<<<<< HEAD
-   if (x < minx)
-=======
    if (x < minx && !sid->is_mirrored)
->>>>>>> opensource/master
      {
         if (!sid->loop_h) sid->wx = minx;
         else sid->wx = mx;
      }
-<<<<<<< HEAD
-   else if (!sid->loop_h && (x > mx)) sid->wx = mx;
-   else if (sid->loop_h && x >= (sid->ww + mx)) sid->wx = 0;
-=======
->>>>>>> opensource/master
    else if (sid->is_mirrored)
      sid->wx = _elm_scroll_x_mirrored_get(sid->obj, x);
    else if (!sid->loop_h && (x > mx)) sid->wx = mx;
@@ -2130,11 +2121,7 @@ _elm_scroll_momentum_animator(void *data)
         if (!_elm_config->thumbscroll_bounce_enable || !sid->bounce_vert)
           {
              if (y <= miny) no_bounce_y_end = EINA_TRUE;
-<<<<<<< HEAD
-             if (sid->loop_v && (y - miny) >= maxy) no_bounce_y_end = EINA_TRUE;
-=======
              if (!sid->loop_v && (y - miny) >= maxy) no_bounce_y_end = EINA_TRUE;
->>>>>>> opensource/master
           }
         if ((dt >= 1.0) ||
             ((sid->down.bounce_x_hold) && (sid->down.bounce_y_hold)) ||
@@ -4473,8 +4460,6 @@ _elm_interface_scrollable_loop_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int
 
    sid->loop_h = loop_h;
    sid->loop_v = loop_v;
-<<<<<<< HEAD
-=======
 
    if(sid->loop_h)
      edje_object_signal_emit(sid->edje_obj, "elm,loop_x,set", "elm");
@@ -4485,7 +4470,6 @@ _elm_interface_scrollable_loop_set(Eo *obj EINA_UNUSED, Elm_Scrollable_Smart_Int
      edje_object_signal_emit(sid->edje_obj, "elm,loop_y,set", "elm");
    else
      edje_object_signal_emit(sid->edje_obj, "elm,loop_y,unset", "elm");
->>>>>>> opensource/master
 }
 
 EOLIAN static void
index a748f22cd9361a1ad0fd5678a5f09a94ae11b25c..61b33775a57b71996e92ee21e925976ad79b8431 100644 (file)
@@ -1,11 +1,7 @@
 /* handy macros */
 #define ELM_RECTS_INTERSECT(x, y, w, h, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
 #define ELM_PI 3.14159265358979323846
-<<<<<<< HEAD
-#define ELM_SCALE_SIZE(x) (int)(((double)(x) / elm_app_base_scale_get()) * elm_config_scale_get())
-=======
 #define ELM_SCALE_SIZE(x) (int)(((double)(x) * elm_config_scale_get()) / elm_app_base_scale_get())
->>>>>>> opensource/master
 
 // checks if the point(xx, yy) stays out of the rectangle(x, y, w, h) area.
 #define ELM_RECTS_POINT_OUT(x, y, w, h, xx, yy) (((xx) < (x)) || ((yy) < (y)) || ((xx) > ((x) + (w))) || ((yy) > ((y) + (h))))
index 5f4b0fd691f8ad0abd52d56e9c70fa051a1b3b62..ef38744f285a99f7b5496a5bb90993800769802c 100644 (file)
@@ -266,21 +266,13 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl, Evas_Coord view)
           {
              if (!it->separator && !it->object)
                elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-<<<<<<< HEAD
-             edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
-=======
              edje_object_size_min_restricted_calc(elm_layout_edje_get(VIEW(it)), &mw, &mh, mw, mh);
->>>>>>> opensource/master
           }
         else if (!more)
           {
              more = EINA_TRUE;
              elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-<<<<<<< HEAD
-             edje_object_size_min_restricted_calc(sd->VIEW(more_item), &mw, &mh, mw, mh);
-=======
              edje_object_size_min_restricted_calc(elm_layout_edje_get(sd->VIEW(more_item)), &mw, &mh, mw, mh);
->>>>>>> opensource/master
           }
 
         if (mw != -1 || mh != -1)
@@ -640,13 +632,8 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
    focus_raise = elm_layout_data_get(VIEW(it), "focusraise");
    if ((focus_raise) && (!strcmp(focus_raise, "on")))
      evas_object_raise(VIEW(it));
-<<<<<<< HEAD
-   evas_object_smart_callback_call
-      (obj, SIG_ITEM_FOCUSED, EO_OBJ(it));
-=======
    eo_do(obj, eo_event_callback_call
      (ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -672,13 +659,8 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
    elm_layout_signal_emit
       (VIEW(it), "elm,highlight,off", "elm");
    sd->focused_item = NULL;
-<<<<<<< HEAD
-   evas_object_smart_callback_call
-      (obj, SIG_ITEM_UNFOCUSED, eo_it);
-=======
    eo_do(obj, eo_event_callback_call
      (ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it));
->>>>>>> opensource/master
    if (_elm_config->atspi_mode)
      elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
 }
@@ -1503,36 +1485,7 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item_Data *item)
 {
    elm_layout_text_set(VIEW(item), "elm.text", item->label);
    if (item->label)
-<<<<<<< HEAD
-     edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
-   else
-     edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
-
-   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-   // If the min size is changed by edje signal in edc,
-   //the below function should be called before the calculation.
-   edje_object_message_signal_process(VIEW(item));
-   edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
-   if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
-     {
-        if (sd->vertical)
-          {
-             evas_object_size_hint_weight_set
-               (VIEW(item), EVAS_HINT_EXPAND, -1.0);
-             evas_object_size_hint_align_set
-               (VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
-          }
-        else
-          {
-             evas_object_size_hint_weight_set
-               (VIEW(item), -1.0, EVAS_HINT_EXPAND);
-             evas_object_size_hint_align_set
-               (VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
-          }
-     }
-=======
      elm_layout_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
->>>>>>> opensource/master
    else
      elm_layout_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
 }
@@ -2373,11 +2326,8 @@ _elm_toolbar_item_eo_base_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it)
    eo_it = eo_do_super_ret(eo_it, ELM_TOOLBAR_ITEM_CLASS, eo_it, eo_constructor());
    it->base = eo_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
    eo_do(eo_it, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_MENU_ITEM));
-<<<<<<< HEAD
-=======
 
    return eo_it;
->>>>>>> opensource/master
 }
 
 static Elm_Toolbar_Item_Data *
@@ -2466,18 +2416,7 @@ _item_new(Evas_Object *obj,
         elm_layout_signal_emit(VIEW(it), "elm,icon,hidden", "elm");
      }
 
-<<<<<<< HEAD
-   mw = mh = -1;
-   if (!it->separator && !it->object)
-     elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-   // If the min size is changed by edje signal in edc,
-   //the below function should be called before the calculation.
-   edje_object_message_signal_process(VIEW(it));
-   edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
-   if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
-=======
    if (it->label)
->>>>>>> opensource/master
      {
         elm_layout_text_set(VIEW(it), "elm.text", it->label);
         elm_layout_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
@@ -2517,46 +2456,6 @@ _elm_toolbar_item_icon_update(Elm_Toolbar_Item_Data *item)
    else
        elm_layout_signal_emit(VIEW(item), "elm,state,icon,hidden", "elm");
    evas_object_hide(old_icon);
-<<<<<<< HEAD
-   elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-   // If the min size is changed by edje signal in edc,
-   //the below function should be called before the calculation.
-   edje_object_message_signal_process(VIEW(item));
-   edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
-   if (sd->shrink_mode != ELM_TOOLBAR_SHRINK_EXPAND)
-     {
-        if (sd->vertical)
-          {
-             evas_object_size_hint_weight_set
-               (VIEW(item), EVAS_HINT_EXPAND, -1.0);
-             evas_object_size_hint_align_set
-               (VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
-          }
-        else
-          {
-             evas_object_size_hint_weight_set
-               (VIEW(item), -1.0, EVAS_HINT_EXPAND);
-             evas_object_size_hint_align_set
-               (VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
-          }
-     }
-   else
-     {
-        evas_object_size_hint_weight_set
-          (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        evas_object_size_hint_align_set
-          (VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
-     }
-
-   evas_object_size_hint_min_get(VIEW(item), &minw, &minh);
-   if ((minw < mw) && (minh < mh))
-     evas_object_size_hint_min_set(VIEW(item), mw, mh);
-   else if ((minw < mw) && (minh > mh))
-     evas_object_size_hint_min_set(VIEW(item), mw, minh);
-   else if ((minw > mw) && (minh < mh))
-     evas_object_size_hint_min_set(VIEW(item), minw, mh);
-=======
->>>>>>> opensource/master
 
    EINA_LIST_FOREACH(item->states, l, it_state)
      {
@@ -3964,8 +3863,6 @@ _elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_D
    return ret;
 }
 
-<<<<<<< HEAD
-=======
 EOLIAN int
 _elm_toolbar_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
 {
@@ -4067,6 +3964,5 @@ _elm_toolbar_evas_object_smart_calculate(Eo *obj, Elm_Toolbar_Data *pd EINA_UNUS
 }
 
 
->>>>>>> opensource/master
 #include "elm_toolbar.eo.c"
 #include "elm_toolbar_item.eo.c"
index 1b830610296a0ce0e589e5ec228b90ae7c7fa712..f632ea0d8687299775036d69c60e543b32a4fc9c 100644 (file)
@@ -2299,11 +2299,7 @@ _elm_widget_focus_direction_weight_get(const Evas_Object *obj1,
  */
 
 EOLIAN static Eina_Bool
-<<<<<<< HEAD
-_elm_widget_focus_direction_get(Eo *obj, Elm_Widget_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
-=======
 _elm_widget_focus_direction_get(const Eo *obj, Elm_Widget_Smart_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
->>>>>>> opensource/master
 {
    double c_weight;
 
@@ -2376,11 +2372,7 @@ _elm_widget_focus_direction_get(const Eo *obj, Elm_Widget_Smart_Data *sd, const
  * @ingroup Widget
  */
 EOLIAN static Eina_Bool
-<<<<<<< HEAD
-_elm_widget_focus_list_direction_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Evas_Object *base, const Eina_List *items, list_data_get_func_type list_data_get, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
-=======
 _elm_widget_focus_list_direction_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Evas_Object *base, const Eina_List *items, list_data_get_func_type list_data_get, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
->>>>>>> opensource/master
 {
    if (!direction || !weight || !base || !items)
      return EINA_FALSE;
@@ -2417,11 +2409,7 @@ _elm_widget_focus_list_direction_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart
  * @ingroup Widget
  */
 EOLIAN static Eina_Bool
-<<<<<<< HEAD
-_elm_widget_focus_next_get(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
-=======
 _elm_widget_focus_next_get(const Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
->>>>>>> opensource/master
 {
    Elm_Access_Info *ac;
 
@@ -2565,11 +2553,7 @@ _elm_widget_focus_next_get(const Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_D
  * @ingroup Widget
  */
 EOLIAN static Eina_Bool
-<<<<<<< HEAD
-_elm_widget_focus_list_next_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Eina_List *items, list_data_get_func_type list_data_get, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
-=======
 _elm_widget_focus_list_next_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Eina_List *items, list_data_get_func_type list_data_get, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
->>>>>>> opensource/master
 {
    Eina_List *(*list_next)(const Eina_List *list) = NULL;
    Evas_Object *focused_object = NULL;
@@ -2794,11 +2778,7 @@ _elm_widget_focus_next_object_set(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
 }
 
 EOLIAN static Elm_Object_Item*
-<<<<<<< HEAD
-_elm_widget_focus_next_item_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir)
-=======
 _elm_widget_focus_next_item_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd, Elm_Focus_Direction dir)
->>>>>>> opensource/master
 {
    Elm_Object_Item *ret = NULL;
 
@@ -3030,10 +3010,7 @@ _elm_widget_focus_steal(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item *ite
           }
      }
    _parent_focus(obj, item);
-<<<<<<< HEAD
-=======
    elm_widget_focus_region_show(obj);
->>>>>>> opensource/master
    return;
 }
 
@@ -4006,11 +3983,8 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE
 
    if (!obj) return;
    if (!_is_focusable(obj)) return;
-<<<<<<< HEAD
-=======
    top = elm_widget_top_get(obj);
    if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_auto_hide(top);
->>>>>>> opensource/master
    elm_widget_focus_steal(obj, NULL);
 }
 
@@ -4313,11 +4287,7 @@ _elm_widget_focus_move_policy_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *sd
  * Sets the widget's focus move policy.
  *
  * @param obj The widget.
-<<<<<<< HEAD
- * @param policy Elm_Focus_Momve_Policy to set object's focus move policy.
-=======
  * @param policy Elm_Focus_Move_Policy to set object's focus move policy.
->>>>>>> opensource/master
  */
 
 EOLIAN static void
@@ -5633,11 +5603,7 @@ _elm_widget_item_access_object_get(const Eo *eo_item EINA_UNUSED, Elm_Widget_Ite
 }
 
 EOLIAN static Evas_Object *
-<<<<<<< HEAD
-_elm_widget_item_focus_next_object_get(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Elm_Focus_Direction dir)
-=======
 _elm_widget_item_focus_next_object_get(const Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Elm_Focus_Direction dir)
->>>>>>> opensource/master
 {
    Evas_Object *ret = NULL;
 
@@ -5675,11 +5641,7 @@ _elm_widget_item_focus_next_object_set(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_
 }
 
 EOLIAN static Elm_Object_Item*
-<<<<<<< HEAD
-_elm_widget_item_focus_next_item_get(Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Elm_Focus_Direction dir)
-=======
 _elm_widget_item_focus_next_item_get(const Eo *eo_item EINA_UNUSED, Elm_Widget_Item_Data *item, Elm_Focus_Direction dir)
->>>>>>> opensource/master
 {
    Elm_Object_Item *ret = NULL;
 
index 70e6fe923ec7d1ab602e9ecc090bb99b7aaf679e..70c37cd023970617de30c3fb9d1d98fedf7be3d1 100644 (file)
@@ -1,10 +1,6 @@
-<<<<<<< HEAD
-abstract Elm_Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component)
-=======
 import elm_general;
 
 abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Interface_Atspi_Component)
->>>>>>> opensource/master
 {
    eo_prefix: elm_obj_widget;
    data: Elm_Widget_Smart_Data;
@@ -198,21 +194,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
             mode: Elm_Focus_Region_Show_Mode;
          }
       }
-<<<<<<< HEAD
-      focus_region_show_mode {
-         /*Control the focus_region_show mode.*/
-         set {
-         }
-         get {
-         }
-         values {
-            Elm_Focus_Region_Show_Mode mode;
-         }
-      }
-      parent_highlight {
-=======
       @property parent_highlight {
->>>>>>> opensource/master
          set {
          }
          values {
@@ -405,22 +387,6 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
             label: const(char)*;
          }
       }
-<<<<<<< HEAD
-      focus_move_policy {
-         set {
-            /*@ No description supplied by the EAPI. */
-         }
-         get {
-            /*@ No description supplied by the EAPI. */
-         }
-         values {
-            Elm_Focus_Move_Policy policy;
-         }
-      }
-   }
-   methods {
-=======
->>>>>>> opensource/master
       newest_focus_order_get @const {
          return: Evas.Object *;
          params {
@@ -436,28 +402,19 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
          }
       }
       focus_next_object_set {
-<<<<<<< HEAD
-         /*Set the next object with specific focus direction.*/
-=======
          [[Set the next object with specific focus direction.
 
            @since 1.8]]
->>>>>>> opensource/master
          params {
             @in next: Evas.Object * @nullable; [[Focus next object]]
             @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
       }
       focus_next_object_get @const {
-<<<<<<< HEAD
-         /*Get the next object with specific focus direction.*/
-         return: Evas_Object *;
-=======
          [[Get the next object with specific focus direction.
 
            @since 1.8]]
          return: Evas.Object *; [[Focus next object]]
->>>>>>> opensource/master
          params {
             @in dir: Elm.Focus_Direction; [[Focus direction]]
          }
@@ -573,16 +530,9 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
          }
       }
       on_focus {
-<<<<<<< HEAD
-         /*@ 'Virtual' function handling focus in/out events on the widget.
-         return EINA_TRUE if this widget can handle focus, EINA_FALSE otherwise */
-         params {
-            @in Elm_Object_Item *item;
-=======
          [['Virtual' function handling focus in/out events on the widget.  return true if this widget can handle focus, false otherwise]]
          params {
             @in item: Elm_Object_Item * @nullable;
->>>>>>> opensource/master
          }
          return: bool;
       }
@@ -604,19 +554,11 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_direction {
          [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]]
          params {
-<<<<<<< HEAD
-            @in const(Evas_Object)* base;
-            @in double degree;
-            @out Evas_Object *direction;
-            @out Elm_Object_Item *direction_item;
-            @out double weight;
-=======
             @in base: const(Evas.Object)*;
             @in degree: double;
             @out direction: Evas.Object *;
             @out direction_item: Elm_Object_Item *;
             @out weight: double;
->>>>>>> opensource/master
          }
          return: bool;
       }
@@ -650,15 +592,6 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_list_direction_get @const {
          return: bool;
          params {
-<<<<<<< HEAD
-            @in const(Evas_Object)* base;
-            @in const(list)* items;
-            @in list_data_get_func_type list_data_get;
-            @in double degree;
-            @out Evas_Object *direction;
-            @out Elm_Object_Item *direction_item;
-            @out double weight;
-=======
             @in base: const(Evas.Object)*;
             @in items: const(list<Eo.Base*>)*;
             @in list_data_get: list_data_get_func_type;
@@ -666,7 +599,6 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
             @out direction: Evas.Object *;
             @out direction_item: Elm_Object_Item *;
             @out weight: double;
->>>>>>> opensource/master
          }
       }
       focused_object_clear {
@@ -704,15 +636,9 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_next_get @const {
          return: bool;
          params {
-<<<<<<< HEAD
-            @in Elm_Focus_Direction dir;
-            @out Evas_Object *next;
-            @out Elm_Object_Item *next_item;
-=======
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
->>>>>>> opensource/master
          }
       }
       translatable_part_text_get @const {
@@ -741,11 +667,7 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       }
       focus_steal {
          params {
-<<<<<<< HEAD
-            @in Elm_Object_Item *item;
-=======
             @in item: Elm_Object_Item * @nullable;
->>>>>>> opensource/master
          }
       }
       focus_hide_handle {
@@ -753,34 +675,20 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_next {
          [['Virtual' function handling passing focus to sub-objects.]]
          params {
-<<<<<<< HEAD
-            @in Elm_Focus_Direction dir;
-            @out Evas_Object *next;
-            @out Elm_Object_Item *next_item;
-=======
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
->>>>>>> opensource/master
          }
          return: bool;
       }
       focus_list_next_get @const {
          return: bool;
          params {
-<<<<<<< HEAD
-            @in const(list)* items;
-            @in list_data_get_func_type list_data_get;
-            @in Elm_Focus_Direction dir;
-            @out Evas_Object *next;
-            @out Elm_Object_Item *next_item;
-=======
             @in items: const(list<Eo.Base*>)*;
             @in list_data_get: list_data_get_func_type;
             @in dir: Elm.Focus_Direction;
             @out next: Evas.Object *;
             @out next_item: Elm_Object_Item *;
->>>>>>> opensource/master
          }
       }
       focus_mouse_up_handle {
@@ -793,19 +701,11 @@ abstract Elm.Widget (Evas.Object_Smart, Elm_Interface_Atspi_Accessible, Elm_Inte
       focus_direction_get @const {
          return: bool;
          params {
-<<<<<<< HEAD
-            @in const(Evas_Object)* base;
-            @in double degree;
-            @out Evas_Object *direction;
-            @out Elm_Object_Item *direction_item;
-            @out double weight;
-=======
             @in base: const(Evas.Object)*;
             @in degree: double;
             @out direction: Evas.Object *;
             @out direction_item: Elm_Object_Item *;
             @out weight: double;
->>>>>>> opensource/master
          }
       }
       signal_callback_del {
index 2365fabb77ce8ca8b5b3fa324a96fd4dcabaa312..801f78761ec4725428dd0cdc09341f357cf1fb79 100644 (file)
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-class Elm_Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible)
-=======
 class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                       Elm_Interface_Atspi_Component)
->>>>>>> opensource/master
 {
       eo_prefix: elm_wdg_item;
       legacy_prefix: elm_object_item;
@@ -494,53 +490,6 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                 return: bool;
            }
            focus_next_object_get @const {
-<<<<<<< HEAD
-                /**
-                                 Get the next object with specific focus direction.
-
-                                 @ingroup General
-                  @since 1.16
-                                */
-                params {
-                     Elm_Focus_Direction dir;
-                } 
-                return: Evas_Object *;
-           }
-           focus_next_object_set {
-                /**
-                                 Set the next object with specific focus direction.
-
-                                 @ingroup General
-                  @since 1.16
-                                */
-                params {
-                     Evas_Object *next;
-                     Elm_Focus_Direction dir;
-                }
-           }
-           focus_next_item_get @const {
-                /**
-                                 Get the next object item with specific focus direction.
-
-                                 @ingroup General
-                  @since 1.16
-                                */
-                params {
-                     Elm_Focus_Direction dir;
-                }
-                return: Elm_Object_Item *;
-           }
-           focus_next_item_set {
-                /**
-                                 Set the next object item with specific focus direction.
-
-                                 @ingroup General
-                  @since 1.16
-                                */
-                params {
-                     Elm_Object_Item *next_item;
-                     Elm_Focus_Direction dir;
-=======
                 [[Get the next object with specific focus direction.
 
                   @since 1.16]]
@@ -574,7 +523,6 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                 params {
                      next_item: Elm_Object_Item * @nullable; [[Focus next object item]]
                      dir: Elm.Focus_Direction; [[Focus direction]]
->>>>>>> opensource/master
                 }
            }
       }