Peter M. Groen / dali-demo

Commit e86c0caf06d34f4a507903040414f0cb58592f28

Authored by Nick Holland
2 parents 7221d1a5 f57b971d

[dali_1.0.41] Merge branch 'tizen' 

Change-Id: I5ed50dd8faa1c132908926253f5dfdad40b2564a
Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
examples/text-field/text-field-example.cpp
  View file @e86c0ca
@@ -121,6 +121,7 @@ public: @@ -121,6 +121,7 @@ public:
121 mField.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); 121 mField.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
122 mField.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); 122 mField.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
123 mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" ); 123 mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" );
  124 + mField.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Enter folder name." );
124 mField.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) ); 125 mField.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) );
125 126
126 container.Add( mField ); 127 container.Add( mField );
packaging/com.samsung.dali-demo.spec
  View file @e86c0ca
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.0.40 5 +Version: 1.0.41
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0