TizenRefApp-7051 Inscription "Text Messages" is carried by syllables

Change-Id: I7e764d16558e8787d482d43174bcf89352e0cc27
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Conversation/Body/View/inc/BodyView.h b/src/Conversation/Body/View/inc/BodyView.h
index 67ea104dfe815ac9d5c1dc49b1835b885e4f1e01..0831f5e53dd7e4b0a92946a55164dee20dd18249 100644 (file)
--- a/src/Conversation/Body/View/inc/BodyView.h
+++ b/src/Conversation/Body/View/inc/BodyView.h
@@ -45,13 +45,10 @@ namespace Msg
 
         private:
             Evas_Object *createEntry(Evas_Object *parent, int maxCharCount);
-            Evas_Object *createContentBox(Evas_Object *parent);
-
             void onContentBoxGeometryChanged(Evas_Object *obj, void *eventInfo);
 
         private:
-            Evas_Object *m_pRootBox;
-            Evas_Object *m_pContentBox;
+            Evas_Object *m_pGrid;
             Evas_Object *m_pEntry;
     };
 }

diff --git a/src/Conversation/Body/View/src/BodyView.cpp b/src/Conversation/Body/View/src/BodyView.cpp
index 59c9e2f37b3eedd96c9b859bc3ed942bf6845fd7..4cd9221540e6daa3bf203c6ef10fdc81648d6c2a 100644 (file)
--- a/src/Conversation/Body/View/src/BodyView.cpp
+++ b/src/Conversation/Body/View/src/BodyView.cpp
@@ -36,47 +36,25 @@ namespace
 }
 
 BodyView::BodyView(Evas_Object *parent, int maxCharCount)
-    : m_pRootBox(nullptr)
-    , m_pContentBox(nullptr)
+    : m_pGrid(nullptr)
     , m_pEntry(nullptr)
 {
-    // Root box:
-    m_pRootBox = elm_box_add(parent);
-    elm_box_horizontal_set(m_pRootBox, false);
-    setEo(m_pRootBox);
+    // Root grid :
+    m_pGrid = elm_grid_add(parent);
+    setEo(m_pGrid);
 
     // Scroller:
     Evas_Object *scroller = elm_scroller_add(getEo());
-    expand(scroller);
     evas_object_show(scroller);
-    elm_box_pack_end(m_pRootBox, scroller);
 
-    // Content box:
-    Evas_Object *contentBox = createContentBox(scroller);
-    elm_object_content_set(scroller, contentBox);
-
-    // Create entry:
-    elm_box_pack_end(contentBox, createEntry(contentBox, maxCharCount));
+    elm_grid_pack(m_pGrid, scroller, 0, 0, 100, 100);
+    elm_object_content_set(scroller, createEntry(scroller, maxCharCount));
 }
 
 BodyView::~BodyView()
 {
 }
 
-Evas_Object *BodyView::createContentBox(Evas_Object *parent)
-{
-    m_pContentBox = elm_box_add(parent);
-    elm_box_horizontal_set(m_pContentBox, false);
-    evas_object_show(m_pContentBox);
-    evas_object_size_hint_weight_set(m_pContentBox, EVAS_HINT_EXPAND, 0);
-    evas_object_size_hint_align_set(m_pContentBox, EVAS_HINT_FILL, 0);
-
-    evas_object_event_callback_add(m_pContentBox, EVAS_CALLBACK_RESIZE, EVAS_EVENT_CALLBACK(BodyView, onContentBoxGeometryChanged), this);
-    evas_object_event_callback_add(m_pContentBox, EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_EVENT_CALLBACK(BodyView, onContentBoxGeometryChanged), this);
-
-    return m_pContentBox;
-}
-
 bool BodyView::isEmpty() const
 {
     const char *text = elm_entry_entry_get(m_pEntry);
@@ -137,15 +115,10 @@ Evas_Object *BodyView::createEntry(Evas_Object *parent, int maxCharCount)
     elm_entry_autocapital_type_set(m_pEntry, ELM_AUTOCAPITAL_TYPE_SENTENCE);
     elm_entry_input_panel_return_key_type_set(m_pEntry, ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT);
     elm_object_focus_allow_set(m_pEntry, true);
-   // elm_entry_input_panel_enabled_set(m_pEntry, false);  // Keypad is manually controlled
     eext_entry_selection_back_event_allow_set(m_pEntry, true);
     evas_object_size_hint_weight_set(m_pEntry, EVAS_HINT_EXPAND, 0);
     evas_object_size_hint_align_set(m_pEntry, EVAS_HINT_FILL, 0);
 
-    // Preset max width to avoid blink
-    const int maxWidth = ELM_SCALE_SIZE(720);
-    evas_object_resize(m_pEntry, maxWidth, 0);
-
     View::setText(m_pEntry, msgt("IDS_MSG_TMBODY_TEXT_MESSAGES"), "elm.guide");
 
     Elm_Entry_Filter_Limit_Size limitFilter = {};
@@ -170,6 +143,8 @@ Evas_Object *BodyView::createEntry(Evas_Object *parent, int maxCharCount)
         ((BodyView*)data)->onMaxLengthReached();
     }, this);
 
+    evas_object_event_callback_add(m_pEntry, EVAS_CALLBACK_RESIZE, EVAS_EVENT_CALLBACK(BodyView, onContentBoxGeometryChanged), this);
+    evas_object_event_callback_add(m_pEntry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_EVENT_CALLBACK(BodyView, onContentBoxGeometryChanged), this);
 
     return m_pEntry;
 }
@@ -179,11 +154,11 @@ void BodyView::onContentBoxGeometryChanged(Evas_Object *obj, void *event_info)
     int w = 0;
     int h = 0;
 
-    evas_object_geometry_get(m_pContentBox, nullptr, nullptr, &w, &h);
+    evas_object_geometry_get(m_pEntry, nullptr, nullptr, &w, &h);
 
     if(h > maxBodyHeight)
         h = maxBodyHeight;
 
-    evas_object_size_hint_min_set(m_pRootBox, w, h);
-    evas_object_size_hint_max_set(m_pRootBox, w, h);
+    evas_object_size_hint_min_set(m_pGrid, 0, h);
+    evas_object_size_hint_max_set(m_pGrid, -1, h);
 }