elm_entry: "elm.guide" part should be aligned to "elm.text" part.

Attached test code for guide part.
In addition, updated supported part for "guide" in documentation.

diff --git a/data/themes/widgets/entry.edc b/data/themes/widgets/entry.edc
index 00fcc9617261285cc59827ba2149b319d3421a27..baec9d6d87f9151e6574ba865127117443bf3d0e 100644 (file)
--- a/data/themes/widgets/entry.edc
+++ b/data/themes/widgets/entry.edc
@@ -1026,7 +1026,7 @@ group { name: "elm/entry/base-single/default";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;
@@ -1197,7 +1197,7 @@ group { name: "elm/entry/base-password/default";
             text {
                style: "entry_single_textblock_guide_style";
                min: 0 1;
-               align: 0.0 0.0;
+               align: 0.0 0.5;
             }
          }
          description { state: "hidden" 0.0;

diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index 3e1d3eece05c61a70b4c9f9916ec3e7ddde9edcd..9217697b03b6bdebcd4683eb117342d98e037884 100644 (file)
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -300,6 +300,17 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(en);
    elm_box_pack_end(bx, en);
 
+   /* entry with guide */
+   en = elm_entry_add(win);
+   elm_entry_scrollable_set(en, EINA_TRUE);
+   evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
+   elm_scroller_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_object_part_text_set(en, "guide", "This string is guide");
+   elm_entry_single_line_set(en, EINA_TRUE);
+   evas_object_show(en);
+   elm_box_pack_end(bx, en);
+
    /* password entry */
    en = elm_entry_add(win);
    elm_entry_scrollable_set(en, EINA_TRUE);

diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h
index 1f7a63b9e173b8756b33a25dba615daf39635fcc..d1cbfdd3be18a74bd3f145c6a0bb0345e3e829f9 100644 (file)
--- a/src/lib/elm_entry.h
+++ b/src/lib/elm_entry.h
@@ -249,6 +249,7 @@
  *
  * Default text parts of the entry that you can use for are:
  * @li "default" - text of the entry
+ * @li "guide" - placeholder of the entry
  *
  * Supported elm_object common APIs.
  * @li @ref elm_object_signal_emit