3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

[framework/uifw/elementary.git] / src / lib / elm_frame.c

diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 233269e..2f8c093 100644 (file)
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -26,13 +26,9 @@ static void _del_hook(Evas_Object *obj);
 static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-<<<<<<< HEAD
-static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
-=======
 static void _changed_size_hints(void *data,
                                 Evas *e, Evas_Object *obj,
                                 void *event_info);
->>>>>>> remotes/origin/upstream
 static void _sub_del(void *data, Evas_Object *obj, void *event_info);
 
 static void
@@ -59,13 +55,6 @@ _theme_hook(Evas_Object *obj)
    if (!wd) return;
    _elm_widget_mirrored_reload(obj);
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
-<<<<<<< HEAD
-   _elm_theme_object_set(obj, wd->frm, "frame", "base", elm_widget_style_get(obj));
-   edje_object_part_text_set(wd->frm, "elm.text", wd->label);
-   if (wd->content)
-     edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
-   edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale);
-=======
    _elm_theme_object_set(obj, wd->frm, "frame", "base",
                          elm_widget_style_get(obj));
    edje_object_part_text_set(wd->frm, "elm.text", wd->label);
@@ -73,7 +62,6 @@ _theme_hook(Evas_Object *obj)
      edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
    edje_object_scale_set(wd->frm,
                          elm_widget_scale_get(obj) * _elm_config->scale);
->>>>>>> remotes/origin/upstream
    _sizing_eval(obj);
 }
 
@@ -81,23 +69,12 @@ static Eina_Bool
 _elm_frame_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-<<<<<<< HEAD
-   Evas_Object *cur;
-=======
->>>>>>> remotes/origin/upstream
 
    if ((!wd) || (!wd->content))
      return EINA_FALSE;
 
-<<<<<<< HEAD
-   cur = wd->content;
-
-   /* Try Focus cycle in subitem */
-   return elm_widget_focus_next_get(cur, dir, next);
-=======
    /* Try Focus cycle in subitem */
    return elm_widget_focus_next_get(wd->content, dir, next);
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -118,17 +95,10 @@ static void
 _changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-<<<<<<< HEAD
-   // FIXME: why is this needed? how does edje get this unswallowed or
-   // lose its callbacks to edje
-   if (!wd) return;
-   if (wd->anim) return;
-=======
    if (!wd) return;
    if (wd->anim) return;
    // FIXME: why is this needed? how does edje get this unswallowed or
    // lose its callbacks to edje
->>>>>>> remotes/origin/upstream
    edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
    _sizing_eval(data);
 }
@@ -141,12 +111,8 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
    if (!wd) return;
    if (sub == wd->content)
      {
-<<<<<<< HEAD
-        evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-=======
         evas_object_event_callback_del_full(sub,
                                             EVAS_CALLBACK_CHANGED_SIZE_HINTS,
->>>>>>> remotes/origin/upstream
                                             _changed_size_hints, obj);
         wd->content = NULL;
         _sizing_eval(obj);
@@ -170,13 +136,8 @@ _elm_frame_label_get(const Evas_Object *obj, const char *item)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-<<<<<<< HEAD
-   if (item && strcmp(item, "default")) return NULL;
-   if (!wd) return NULL;
-=======
    if (!wd) return NULL;
    if (item && strcmp(item, "default")) return NULL;
->>>>>>> remotes/origin/upstream
    return wd->label;
 }
 
@@ -195,12 +156,8 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
    if (content)
      {
         elm_widget_sub_object_add(obj, content);
-<<<<<<< HEAD
-        evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-=======
         evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
->>>>>>> remotes/origin/upstream
                                        _changed_size_hints, obj);
         edje_object_part_swallow(wd->frm, "elm.swallow.content", content);
      }
@@ -216,10 +173,7 @@ _content_get_hook(const Evas_Object *obj, const char *part)
    if (part && strcmp(part, "default")) return NULL;
    wd = elm_widget_data_get(obj);
    if (!wd) return NULL;
-<<<<<<< HEAD
-=======
 
->>>>>>> remotes/origin/upstream
    return wd->content;
 }
 
@@ -231,12 +185,7 @@ _content_unset_hook(Evas_Object *obj, const char *part)
    Evas_Object *content;
    if (part && strcmp(part, "default")) return NULL;
    wd = elm_widget_data_get(obj);
-<<<<<<< HEAD
-   if (!wd) return NULL;
-   if (!wd->content) return NULL;
-=======
    if (!wd || !wd->content) return NULL;
->>>>>>> remotes/origin/upstream
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
    evas_object_event_callback_del_full(wd->content,
@@ -319,29 +268,17 @@ elm_frame_add(Evas_Object *parent)
 }
 
 EAPI void
-<<<<<<< HEAD
-elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool enable)
-=======
 elm_frame_autocollapse_set(Evas_Object *obj, Eina_Bool autocollapse)
->>>>>>> remotes/origin/upstream
 {
    Widget_Data *wd;
    ELM_CHECK_WIDTYPE(obj, widtype);
    wd = elm_widget_data_get(obj);
    if (!wd) return;
-<<<<<<< HEAD
-   wd->collapsible = !!enable;
-}
-
-EAPI Eina_Bool
-elm_frame_autocollapse_get(Evas_Object *obj)
-=======
    wd->collapsible = !!autocollapse;
 }
 
 EAPI Eina_Bool
 elm_frame_autocollapse_get(const Evas_Object *obj)
->>>>>>> remotes/origin/upstream
 {
    Widget_Data *wd;
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
@@ -361,11 +298,7 @@ elm_frame_collapse_set(Evas_Object *obj, Eina_Bool collapse)
    if (wd->collapsed == collapse) return;
    edje_object_signal_emit(wd->frm, "elm,action,switch", "elm");
    edje_object_message_signal_process(wd->frm);
-<<<<<<< HEAD
-   wd->collapsed = collapse;
-=======
    wd->collapsed = !!collapse;
->>>>>>> remotes/origin/upstream
    wd->anim = EINA_FALSE;
    _sizing_eval(obj);
 }
@@ -380,21 +313,13 @@ elm_frame_collapse_go(Evas_Object *obj, Eina_Bool collapse)
    collapse = !!collapse;
    if (wd->collapsed == collapse) return;
    edje_object_signal_emit(wd->frm, "elm,action,toggle", "elm");
-<<<<<<< HEAD
-   evas_object_smart_callback_add(wd->frm, "recalc", (Evas_Smart_Cb)_recalc, obj);
-=======
    evas_object_smart_callback_add(wd->frm, "recalc", _recalc, obj);
->>>>>>> remotes/origin/upstream
    wd->collapsed = collapse;
    wd->anim = EINA_TRUE;
 }
 
 EAPI Eina_Bool
-<<<<<<< HEAD
-elm_frame_collapse_get(Evas_Object *obj)
-=======
 elm_frame_collapse_get(const Evas_Object *obj)
->>>>>>> remotes/origin/upstream
 {
    Widget_Data *wd;
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
@@ -402,37 +327,3 @@ elm_frame_collapse_get(const Evas_Object *obj)
    if (!wd) return EINA_FALSE;
    return wd->collapsed;
 }
-<<<<<<< HEAD
-
-
-EAPI void
-elm_frame_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_frame_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_frame_label_get(const Evas_Object *obj)
-{
-   return _elm_frame_label_get(obj, NULL);
-}
-
-EAPI void
-elm_frame_content_set(Evas_Object *obj, Evas_Object *content)
-{
-   _content_set_hook(obj, NULL, content);
-}
-
-EAPI Evas_Object *
-elm_frame_content_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, NULL);
-}
-
-EAPI Evas_Object *
-elm_frame_content_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, NULL);
-}
-=======
->>>>>>> remotes/origin/upstream