From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 28 Aug 2015 11:50:35 +0000 (-0700)
Subject: Merge "System font family change to update font in TextField" into devel/master
X-Git-Tag: dali_1.1.2~17
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0b168b2809db16cbcc82378fd4b031ba3fde3113;hp=785904f5477a648bc0005dcbb39bd3a85077e32d

Merge "System font family change to update font in TextField" into devel/master
---

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index eeb7fa5..eb12543 100644
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1133,7 +1133,15 @@ void TextField::OnPan( const PanGesture& gesture )
 
 void TextField::OnLongPress( const LongPressGesture& gesture )
 {
+  // Show the keyboard if it was hidden.
+  if (!VirtualKeyboard::IsVisible())
+  {
+    VirtualKeyboard::Show();
+  }
+
   mController->LongPressEvent( gesture.state, gesture.localPoint.x, gesture.localPoint.y );
+
+  SetKeyInputFocus();
 }
 
 bool TextField::OnKeyEvent( const KeyEvent& event )