Merge branch 'upstream'

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

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index a1b704f..44ee0d1 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -11,6 +11,7 @@
 
 /**
  * @defgroup Conformant Conformant
+ * @ingroup Elementary
  *
  * The aim is to provide a widget that can be used in elementary apps to
  * account for space taken up by the indicator, virtual keypad & softkey windows when running
@@ -158,13 +159,15 @@ static void
 _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type)
 {
    Ecore_X_Window zone, xwin;
+   Evas_Object *top;
    int sx = -1, sy = -1, sw = -1, sh = -1;
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
 
-   Evas_Object *top = elm_widget_top_get(obj);
+   top = elm_widget_top_get(obj);
    xwin = elm_win_xwindow_get(top);
+
    zone = ecore_x_e_illume_zone_get(xwin);
 
    if (part_type & ELM_CONFORM_INDICATOR_PART)
@@ -202,6 +205,7 @@ _swallow_conformant_parts(Evas_Object *obj)
    else
      _conformant_part_sizing_eval(obj, ELM_CONFORM_INDICATOR_PART);
 #endif
+
    evas_object_color_set(wd->shelf, 0, 0, 0, 0);
    edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf);
 
@@ -231,6 +235,7 @@ _swallow_conformant_parts(Evas_Object *obj)
    else
      _conformant_part_sizing_eval(obj, ELM_CONFORM_SOFTKEY_PART);
 #endif
+
    evas_object_color_set(wd->panel, 0, 0, 0, 0);
    edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel);
 }
@@ -355,7 +360,7 @@ _content_resize_event_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj
         if (h < _elm_config->finger_size)
           h = _elm_config->finger_size;
 
-        elm_widget_show_region_set(focus_obj, x, y, w, h);
+        elm_widget_show_region_set(focus_obj, x, y, w, h, EINA_TRUE);
      }
 }
 
@@ -577,6 +582,7 @@ elm_conformant_content_unset(Evas_Object *obj)
    wd->content = NULL;
    return content;
 }
+
 /**
  * Returns the Evas_Object that represents the content area.
  *
@@ -585,6 +591,7 @@ elm_conformant_content_unset(Evas_Object *obj)
  *
  * @ingroup Conformant
  */
+
 EAPI Evas_Object *
 elm_conformant_content_area_get(const Evas_Object *obj)
 {
@@ -594,6 +601,7 @@ elm_conformant_content_area_get(const Evas_Object *obj)
    if (!wd) return NULL;
    /*Finger waggle warning*/
    _elm_dangerous_call_check(__FUNCTION__);
+
    return (Evas_Object *)edje_object_part_object_get(wd->base, "elm.swallow.content");
 }