projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 264dbea 66521be)
Merge "Add PIXEL_SIZE and ELLIPSIS property in text-controls" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 27 Apr 2017 09:00:40 +0000 (09:00 +0000)
1  2 
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp patch | diff1 | diff2 | blob | history
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp patch | diff1 | diff2 | blob | history
dali-toolkit/devel-api/file.list patch | diff1 | diff2 | blob | history
dali-toolkit/internal/visuals/text/text-visual.cpp patch | diff1 | diff2 | blob | history

diff --combined automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
index b7829fa,a37f30c..6455402
--- 1/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
@@@ -92,6 -92,7 +92,7 @@@ const char* const PROPERTY_NAME_SMOOTH_
  const char* const PROPERTY_NAME_ENABLE_SCROLL_BAR                    = "enableScrollBar";
  const char* const PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION             = "scrollBarShowDuration";
  const char* const PROPERTY_NAME_SCROLL_BAR_FADE_DURATION             = "scrollBarFadeDuration";
+ const char* const PROPERTY_NAME_PIXEL_SIZE                           = "pixelSize";
  
  const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
  
@@@ -189,8 -190,7 +190,8 @@@ Integration::KeyEvent GenerateKey( cons
                                     int keyModifier,
                                     unsigned long timeStamp,
                                     const Integration::KeyEvent::State& keyState,
 -                                   const std::string& deviceName )
 +                                   const std::string& deviceName,
 +                                   const DevelKeyEvent::DeviceClass::Type& deviceClass )
  {
    return Integration::KeyEvent( keyName,
                                  keyString,
@@@ -198,8 -198,7 +199,8 @@@
                                  keyModifier,
                                  timeStamp,
                                  keyState,
 -                                deviceName );
 +                                deviceName,
 +                                deviceClass );
  }
  
  /**
@@@ -431,6 -430,7 +432,7 @@@ int UtcDaliTextEditorGetPropertyP(void
    DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_ENABLE_SCROLL_BAR ) == DevelTextEditor::Property::ENABLE_SCROLL_BAR );
    DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_BAR_SHOW_DURATION ) == DevelTextEditor::Property::SCROLL_BAR_SHOW_DURATION );
    DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_SCROLL_BAR_FADE_DURATION ) == DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION );
+   DALI_TEST_CHECK( editor.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == DevelTextEditor::Property::PIXEL_SIZE );
  
    END_TEST;
  }
@@@ -719,6 -719,10 +721,10 @@@ int UtcDaliTextEditorSetPropertyP(void
    editor.SetProperty( DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION, 0.2f );
    DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION ), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
  
+   // Check the pixel size of font
+   editor.SetProperty( DevelTextEditor::Property::PIXEL_SIZE, 20.f );
+   DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ 
    END_TEST;
  }
  
@@@ -778,7 -782,7 +784,7 @@@ int utcDaliTextEditorTextChangedP(void
    editor.SetKeyInputFocus();
  
    gTextChangedCallBackCalled = false;
 -  application.ProcessEvent( GenerateKey( "D", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME  ) );
 +  application.ProcessEvent( GenerateKey( "D", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    DALI_TEST_CHECK( gTextChangedCallBackCalled );
  
    END_TEST;
@@@ -1098,7 -1102,7 +1104,7 @@@ int utcDaliTextEditorInputStyleChanged0
    gInputStyleMask = TextEditor::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1123,7 -1127,7 +1129,7 @@@
    gInputStyleMask = TextEditor::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1139,7 -1143,7 +1145,7 @@@
    gInputStyleMask = TextEditor::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1180,7 -1184,7 +1186,7 @@@
    editor.SetProperty( TextEditor::Property::INPUT_EMBOSS, "emboss" );
    editor.SetProperty( TextEditor::Property::INPUT_OUTLINE, "outline" );
  
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1288,7 -1292,7 +1294,7 @@@ int utcDaliTextEditorEvent01(void
    application.Render();
  
    // Add a key event but as the text editor has not the focus it should do nothing.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1305,8 -1309,8 +1311,8 @@@
    application.Render();
  
    // Now the text editor has the focus, so it can handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1337,8 -1341,8 +1343,8 @@@
    application.Render();
  
    // The second text editor has the focus. It should handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1394,8 -1398,8 +1400,8 @@@ int utcDaliTextEditorEvent02(void
    DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
  
    // Now the text editor has the focus, so it can handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1419,8 -1423,8 +1425,8 @@@
    // Move the cursor and check the position changes.
    Vector3 position1 = cursor.GetCurrentPosition();
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1430,8 -1434,8 +1436,8 @@@
  
    DALI_TEST_CHECK( position2.x < position1.x );
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1469,8 -1473,8 +1475,8 @@@
    DALI_TEST_CHECK( position5.x > position4.x );
  
    // Remove all the text.
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    editor.SetProperty( TextEditor::Property::TEXT, "" );
  
    // Render and notify
@@@ -1610,8 -1614,8 +1616,8 @@@ int utcDaliTextEditorEvent04(void
    application.Render();
  
    // Move at the end of the text.
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1619,8 -1623,8 +1625,8 @@@
  
    for( unsigned int index = 0u; index < 10u; ++index )
    {
 -    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
      // Render and notify
      application.SendNotification();
@@@ -1628,7 -1632,7 +1634,7 @@@
    }
  
    // Add a character
 -  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1637,8 -1641,8 +1643,8 @@@
    DALI_TEST_EQUALS( "Hello\nworld", editor.GetProperty<std::string>( TextEditor::Property::TEXT ), TEST_LOCATION );
  
    // Add some key events
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_UP, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1646,8 -1650,8 +1652,8 @@@
  
    for( unsigned int index = 0u; index < 10u; ++index )
    {
 -    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
      // Render and notify
      application.SendNotification();
@@@ -1655,7 -1659,7 +1661,7 @@@
    }
  
    // Add a character
 -  application.ProcessEvent( GenerateKey( " ", " ", KEY_WHITE_SPACE_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( " ", " ", KEY_WHITE_SPACE_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1705,8 -1709,8 +1711,8 @@@ int utcDaliTextEditorEvent05(void
    application.Render();
  
    // Move at the end of the text.
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_DOWN, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1715,7 -1719,7 +1721,7 @@@
    for( unsigned int index = 0u; index < 10u; ++index )
    {
      // Add a character
 -    application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
      // Render and notify
      application.SendNotification();
@@@ -1727,7 -1731,7 +1733,7 @@@
    // Continuous scroll left to increase coverage
    for( unsigned int index = 0u; index < 10u; ++index )
    {
 -    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
      // Render and notify
      application.SendNotification();
@@@ -1740,7 -1744,7 +1746,7 @@@
    DALI_TEST_EQUALS( editor.GetProperty<float>( DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION ), 0.2f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
  
    // Press Escape to increase coverage
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
diff --combined automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
index 3e91406,cd6fe19..b05305b
--- 1/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
@@@ -97,6 -97,7 +97,7 @@@ const char* const PROPERTY_NAME_OUTLIN
  const char* const PROPERTY_NAME_INPUT_OUTLINE                        = "inputOutline";
  
  const char* const PROPERTY_NAME_HIDDEN_INPUT_SETTINGS                = "hiddenInputSettings";
+ const char* const PROPERTY_NAME_PIXEL_SIZE                           = "pixelSize";
  
  const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
  
@@@ -304,8 -305,7 +305,8 @@@ Integration::KeyEvent GenerateKey( cons
                                     int keyModifier,
                                     unsigned long timeStamp,
                                     const Integration::KeyEvent::State& keyState,
 -                                   const std::string& deviceName )
 +                                   const std::string& deviceName,
 +                                   const DevelKeyEvent::DeviceClass::Type& deviceClass )
  {
    return Integration::KeyEvent( keyName,
                                  keyString,
@@@ -313,8 -313,7 +314,8 @@@
                                  keyModifier,
                                  timeStamp,
                                  keyState,
 -                                deviceName );
 +                                deviceName,
 +                                deviceClass );
  }
  
  bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet )
@@@ -505,6 -504,7 +506,7 @@@ int UtcDaliTextFieldGetPropertyP(void
    DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_OUTLINE ) == TextField::Property::OUTLINE );
    DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_OUTLINE ) == TextField::Property::INPUT_OUTLINE );
    DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_HIDDEN_INPUT_SETTINGS ) == DevelTextField::Property::HIDDEN_INPUT_SETTINGS );
+   DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == DevelTextField::Property::PIXEL_SIZE );
  
    END_TEST;
  }
@@@ -839,6 -839,10 +841,10 @@@ int UtcDaliTextFieldSetPropertyP(void
    DALI_TEST_EQUALS( hiddenMapSet.Count(), hiddenMapGet.Count(), TEST_LOCATION );
    DALI_TEST_EQUALS( DaliTestCheckMaps( hiddenMapSet, hiddenMapGet ), true, TEST_LOCATION );
  
+   // Check the pixel size of font
+   field.SetProperty( DevelTextField::Property::PIXEL_SIZE, 20.f );
+   DALI_TEST_EQUALS( field.GetProperty<float>( DevelTextField::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ 
    END_TEST;
  }
  
@@@ -898,7 -902,7 +904,7 @@@ int utcDaliTextFieldTextChangedP(void
    field.SetKeyInputFocus();
  
    gTextChangedCallBackCalled = false;
 -  application.ProcessEvent( GenerateKey( "D", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "D", "D", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    DALI_TEST_CHECK( gTextChangedCallBackCalled );
  
    END_TEST;
@@@ -951,8 -955,8 +957,8 @@@ int utcDaliTextFieldMaxCharactersReache
  
    gMaxCharactersCallBackCalled = false;
  
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    DALI_TEST_CHECK( gMaxCharactersCallBackCalled );
    DALI_TEST_CHECK( maxLengthReachedSignal );
@@@ -983,8 -987,8 +989,8 @@@ int utcDaliTextFieldMaxCharactersReache
  
    gMaxCharactersCallBackCalled = false;
  
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    DALI_TEST_CHECK( !gMaxCharactersCallBackCalled );
    DALI_TEST_CHECK( !maxLengthReachedSignal );
@@@ -1301,7 -1305,7 +1307,7 @@@ int utcDaliTextFieldInputStyleChanged02
    gInputStyleMask = TextField::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1326,7 -1330,7 +1332,7 @@@
    gInputStyleMask = TextField::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1342,7 -1346,7 +1348,7 @@@
    gInputStyleMask = TextField::InputStyle::NONE;
    inputStyleChangedSignal = false;
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1449,7 -1453,7 +1455,7 @@@ int utcDaliTextFieldEvent01(void
    application.Render();
  
    // Add a key event but as the text field has not the focus it should do nothing.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1466,8 -1470,8 +1472,8 @@@
    application.Render();
  
    // Now the text field has the focus, so it can handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1498,8 -1502,8 +1504,8 @@@
    application.Render();
  
    // The second text field has the focus. It should handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1557,8 -1561,8 +1563,8 @@@ int utcDaliTextFieldEvent02(void
    DALI_TEST_EQUALS( stencil.GetChildCount(), 0u, TEST_LOCATION );
  
    // Now the text field has the focus, so it can handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1582,8 -1586,8 +1588,8 @@@
    // Move the cursor and check the position changes.
    Vector3 position1 = cursor.GetCurrentPosition();
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_LEFT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1593,8 -1597,8 +1599,8 @@@
  
    DALI_TEST_CHECK( position2.x < position1.x );
  
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_CURSOR_RIGHT, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -1632,8 -1636,8 +1638,8 @@@
    DALI_TEST_CHECK( position5.x > position4.x );
  
    // Remove all the text.
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    field.SetProperty( TextField::Property::TEXT, "" );
  
    // Render and notify
@@@ -2039,14 -2043,14 +2045,14 @@@ int utcDaliTextFieldEvent09(void
    Property::Map map;
    map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_NONE;
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
 -  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
    map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_ALL;
    map[ HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23;
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
 -  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
@@@ -2055,7 -2059,7 +2061,7 @@@
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
    for( unsigned int index = 0u; index < 5u; ++index )
    {
 -    application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
      application.SendNotification();
      application.Render();
    }
@@@ -2065,7 -2069,7 +2071,7 @@@
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
    for( unsigned int index = 0u; index < 5u; ++index )
    {
 -    application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +    application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
      application.SendNotification();
      application.Render();
    }
@@@ -2073,16 -2077,16 +2079,16 @@@
    map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::SHOW_LAST_CHARACTER;
    map[ HiddenInput::Property::SHOW_DURATION ] = 0;
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
 -  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
    map[ HiddenInput::Property::SHOW_DURATION ] = 100;
    field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map );
 -  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
@@@ -2194,7 -2198,7 +2200,7 @@@ int utcDaliTextFieldStyleWhilstSelected
    DALI_TEST_EQUALS( DaliTestCheckMaps( fontStyleMapGet, fontStyleMapSet ), true, TEST_LOCATION );
  
    // Press Escape to increase coverage
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
    application.SendNotification();
    application.Render();
  
@@@ -2228,8 -2232,8 +2234,8 @@@ int utcDaliTextFieldEscKeyLoseFocus(voi
    application.Render();
  
    // Add a key event but as the text field has not the focus it should do nothing.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -2246,10 -2250,10 +2252,10 @@@
    application.Render();
  
    // Now the text field has the focus, so it can handle the key events.
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "d", "d", KEY_D_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -2258,8 -2262,8 +2264,8 @@@
    DALI_TEST_EQUALS( field.GetProperty<std::string>( TextField::Property::TEXT ), std::string("ad"), TEST_LOCATION );
  
    // Generate a Esc key event. The text field should lose the focus.
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -2268,8 -2272,8 +2274,8 @@@
    DALI_TEST_EQUALS( false, field.HasKeyInputFocus(), TEST_LOCATION );
  
    // No more text should be introduced
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "a", "a", KEY_A_CODE, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
@@@ -2334,24 -2338,24 +2340,24 @@@ int utcDaliTextFieldSomeSpecialKeys(voi
    application.Render();
  
    // Generate a Esc key event. The text field should lose the focus.
 -  application.ProcessEvent( GenerateKey( "XF86PowerOff", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "XF86PowerOff", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "XF86PowerOff", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "XF86PowerOff", "XF86PowerOff", DALI_KEY_POWER, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
    application.Render();
  
    // Generate a Esc key event. The text field should lose the focus.
 -  application.ProcessEvent( GenerateKey( "XF86Menu", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "XF86Menu", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "XF86Menu", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "XF86Menu", "XF86Menu", DALI_KEY_MENU, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
    application.Render();
  
    // Generate a Esc key event. The text field should lose the focus.
 -  application.ProcessEvent( GenerateKey( "XF86Home", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME ) );
 -  application.ProcessEvent( GenerateKey( "XF86Home", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME ) );
 +  application.ProcessEvent( GenerateKey( "XF86Home", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
 +  application.ProcessEvent( GenerateKey( "XF86Home", "XF86Home", DALI_KEY_HOME, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE ) );
  
    // Render and notify
    application.SendNotification();
diff --combined dali-toolkit/devel-api/file.list
index a434aef,b117871..fca2972
--- 1/dali-toolkit/devel-api/file.list
--- 2/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -4,7 -4,6 +4,7 @@@ devel_api_src_files = 
    $(devel_api_src_dir)/builder/builder.cpp \
    $(devel_api_src_dir)/builder/json-parser.cpp \
    $(devel_api_src_dir)/builder/tree-node.cpp \
 +  $(devel_api_src_dir)/controls/control-devel.cpp \
    $(devel_api_src_dir)/controls/control-wrapper.cpp \
    $(devel_api_src_dir)/controls/control-wrapper-impl.cpp \
    $(devel_api_src_dir)/controls/bloom-view/bloom-view.cpp \
@@@ -133,6 -132,7 +133,7 @@@ devel_api_text_controls_header_files = 
    $(devel_api_src_dir)/controls/text-controls/hidden-input-properties.h \
    $(devel_api_src_dir)/controls/text-controls/text-editor-devel.h \
    $(devel_api_src_dir)/controls/text-controls/text-field-devel.h \
+   $(devel_api_src_dir)/controls/text-controls/text-label-devel.h \
    $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h \
    $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h
  
diff --combined dali-toolkit/internal/visuals/text/text-visual.cpp
index 473abf5,9668ec8..3ff4ce8
--- 1/dali-toolkit/internal/visuals/text/text-visual.cpp
--- 2/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@@ -248,7 -248,7 +248,7 @@@ void TextVisual::DoCreatePropertyMap( P
    GetFontStyleProperty( mController, value, Text::FontStyle::DEFAULT );
    map.Insert( Toolkit::TextVisual::Property::FONT_STYLE, value );
  
-   map.Insert( Toolkit::TextVisual::Property::POINT_SIZE, mController->GetDefaultPointSize() );
+   map.Insert( Toolkit::TextVisual::Property::POINT_SIZE, mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ) );
  
    map.Insert( Toolkit::TextVisual::Property::MULTI_LINE, mController->IsMultiLineEnabled() );
  
@@@ -379,9 -379,9 +379,9 @@@ void TextVisual::DoSetProperty( Dali::P
      case Toolkit::TextVisual::Property::POINT_SIZE:
      {
        const float pointSize = propertyValue.Get<float>();
-       if( !Equals( mController->GetDefaultPointSize(), pointSize ) )
+       if( !Equals( mController->GetDefaultFontSize( Text::Controller::POINT_SIZE ), pointSize ) )
        {
-         mController->SetDefaultPointSize( pointSize );
+         mController->SetDefaultFontSize( pointSize, Text::Controller::POINT_SIZE );
        }
        break;
      }
@@@ -510,9 -510,6 +510,9 @@@ void TextVisual::UpdateRenderer( bool i
        mImpl->mRenderer.SetTextures( textureSet );
  
        control.AddRenderer( mImpl->mRenderer );
 +
 +      // Text rendered and ready to display
 +      ResourceReady();
      }
    }
  }
Domain: Graphics System / DALi;