[Elm_COnformant] CQ H0100125039 Fixed. On each resizing of conformant area, show...

review.

Change-Id: I1e3ce9582c45768ec0d75218e8e454d2e8f98138

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 09dc5e7..06b3205 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -306,9 +306,8 @@ _content_resize_event_cb(void *data, Evas *e, Evas_Object *obj,
 
       if (h < _elm_config->finger_size)
          h = _elm_config->finger_size;
-      else
-         h = 1 + h; //elm_widget_show_region_set expects some change, to redo the job.
-      elm_widget_show_region_set(focus_obj, x, y, w, h);
+
+      elm_widget_show_region_set(focus_obj, x, y, w, h, EINA_TRUE);
    }
 }
 

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 403c534..d5d5e3d 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -674,7 +674,7 @@ _elm_win_recalc_job(void *data)
       evas_object_size_hint_max_set(data, -1, minh);
 
    if (wd->deferred_cur)
-     elm_widget_show_region_set(data, wd->cx, wd->cy, wd->cw, wd->ch);
+     elm_widget_show_region_set(data, wd->cx, wd->cy, wd->cw, wd->ch, EINA_FALSE);
 }
 
 static void
@@ -1673,7 +1673,7 @@ _signal_magnifier_changed(void *data, Evas_Object *obj __UNUSED__, const char *e
 
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
    if (!wd->deferred_recalc_job)
-      elm_widget_show_region_set(data, cx, cy, cw, ch);
+      elm_widget_show_region_set(data, cx, cy, cw, ch, EINA_FALSE);
    else
      {
         wd->deferred_cur = EINA_TRUE;
@@ -1698,7 +1698,7 @@ _signal_selection_changed(void *data, Evas_Object *obj __UNUSED__, const char *e
 
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
    if (!wd->deferred_recalc_job)
-      elm_widget_show_region_set(data, cx, cy, cw, ch + elm_finger_size_get());
+      elm_widget_show_region_set(data, cx, cy, cw, ch + elm_finger_size_get(), EINA_FALSE);
    else
      {
         wd->deferred_cur = EINA_TRUE;
@@ -1807,7 +1807,7 @@ _signal_cursor_changed(void *data, Evas_Object *obj __UNUSED__, const char *emis
                                              &cx, &cy, &cw, &ch);
    wd->cursor_pos = edje_object_part_text_cursor_pos_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
    if (!wd->deferred_recalc_job)
-     elm_widget_show_region_set(data, cx, cy, cw, ch);
+     elm_widget_show_region_set(data, cx, cy, cw, ch, EINA_FALSE);
    else
      {
         wd->deferred_cur = EINA_TRUE;

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 97d71aa..2213271 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -1819,13 +1819,15 @@ elm_widget_show_region_set(Evas_Object *obj,
                            Evas_Coord   x,
                            Evas_Coord   y,
                            Evas_Coord   w,
-                           Evas_Coord   h)
+                           Evas_Coord   h,
+                           Eina_Bool forceshow)
 {
    Evas_Object *parent_obj, *child_obj;
    Evas_Coord px, py, cx, cy;
 
    API_ENTRY return;
-   if ((x == sd->rx) && (y == sd->ry) && (w == sd->rw) && (h == sd->rh)) return;
+   if (!forceshow && (x == sd->rx) && (y == sd->ry)
+            && (w == sd->rw) && (h == sd->rh)) return;
    sd->rx = x;
    sd->ry = y;
    sd->rw = w;
@@ -3069,4 +3071,4 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
    (void)top;
    (void)output;
 #endif
-}
\ No newline at end of file
+}

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 7296eab..396f3ff 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -270,7 +270,7 @@ EAPI void             elm_widget_activate(Evas_Object *obj);
 EAPI void             elm_widget_change(Evas_Object *obj);
 EAPI void             elm_widget_disabled_set(Evas_Object *obj, int disabled);
 EAPI int              elm_widget_disabled_get(const Evas_Object *obj);
-EAPI void             elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+EAPI void             elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool forceshow);
 EAPI void             elm_widget_show_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 EAPI void             elm_widget_focus_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 EAPI void             elm_widget_scroll_hold_push(Evas_Object *obj);