From: Adeel Kazmi Date: Wed, 4 Oct 2017 12:36:18 +0000 (+0100) Subject: (TextField) Made all Devel properties public X-Git-Tag: dali_1.2.60~4 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0ac0783f6dd2fc14ed111373ffa60bda4c94f587 (TextField) Made all Devel properties public Change-Id: Icacc01dc0a16d313a45c8ab9b30457fe9a61cecc --- diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index 00feb29..66f1875 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include "toolkit-clipboard.h" using namespace Dali; @@ -510,11 +508,11 @@ int UtcDaliTextFieldGetPropertyP(void) DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_INPUT_EMBOSS ) == TextField::Property::INPUT_EMBOSS ); 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 ); - DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_SELECTION ) == DevelTextField::Property::ENABLE_SELECTION ); - DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER ) == DevelTextField::Property::PLACEHOLDER ); - DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS ) == DevelTextField::Property::ELLIPSIS ); + DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_HIDDEN_INPUT_SETTINGS ) == TextField::Property::HIDDEN_INPUT_SETTINGS ); + DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PIXEL_SIZE ) == TextField::Property::PIXEL_SIZE ); + DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ENABLE_SELECTION ) == TextField::Property::ENABLE_SELECTION ); + DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_PLACEHOLDER ) == TextField::Property::PLACEHOLDER ); + DALI_TEST_CHECK( field.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS ) == TextField::Property::ELLIPSIS ); END_TEST; } @@ -858,22 +856,22 @@ int UtcDaliTextFieldSetPropertyP(void) Property::Map hiddenMapSet; Property::Map hiddenMapGet; hiddenMapSet[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_ALL; - hiddenMapSet[ HiddenInput::Property::SHOW_DURATION ] = 2; + hiddenMapSet[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 2; hiddenMapSet[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 4; hiddenMapSet[ HiddenInput::Property::SUBSTITUTE_CHARACTER ] = 0x23; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, hiddenMapSet ); + field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, hiddenMapSet ); - hiddenMapGet = field.GetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS ); + hiddenMapGet = field.GetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS ); 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( DevelTextField::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + field.SetProperty( TextField::Property::PIXEL_SIZE, 20.f ); + DALI_TEST_EQUALS( field.GetProperty( TextField::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); // Check the enable selection property - field.SetProperty( DevelTextField::Property::ENABLE_SELECTION, false ); - DALI_TEST_EQUALS( field.GetProperty( DevelTextField::Property::ENABLE_SELECTION ), false, TEST_LOCATION ); + field.SetProperty( TextField::Property::ENABLE_SELECTION, false ); + DALI_TEST_EQUALS( field.GetProperty( TextField::Property::ENABLE_SELECTION ), false, TEST_LOCATION ); // Check the placeholder property with pixel size Property::Map placeholderPixelSizeMapSet; @@ -888,9 +886,9 @@ int UtcDaliTextFieldSetPropertyP(void) placeholderFontstyleMap.Insert( "weight", "bold" ); placeholderPixelSizeMapSet["placeholderFontStyle"] = placeholderFontstyleMap; - field.SetProperty( DevelTextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet ); + field.SetProperty( TextField::Property::PLACEHOLDER, placeholderPixelSizeMapSet ); - placeholderPixelSizeMapGet = field.GetProperty( DevelTextField::Property::PLACEHOLDER ); + placeholderPixelSizeMapGet = field.GetProperty( TextField::Property::PLACEHOLDER ); DALI_TEST_EQUALS( placeholderPixelSizeMapGet.Count(), placeholderPixelSizeMapSet.Count(), TEST_LOCATION ); DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderPixelSizeMapGet, placeholderPixelSizeMapSet ), true, TEST_LOCATION ); @@ -911,9 +909,9 @@ int UtcDaliTextFieldSetPropertyP(void) placeholderFontstyleMap.Insert( "width", "condensed" ); placeholderFontstyleMap.Insert( "slant", "italic" ); placeholderMapSet["placeholderFontStyle"] = placeholderFontstyleMap; - field.SetProperty( DevelTextField::Property::PLACEHOLDER, placeholderMapSet ); + field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet ); - placeholderMapGet = field.GetProperty( DevelTextField::Property::PLACEHOLDER ); + placeholderMapGet = field.GetProperty( TextField::Property::PLACEHOLDER ); DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION ); DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION ); @@ -922,31 +920,31 @@ int UtcDaliTextFieldSetPropertyP(void) placeholderFontstyleMap.Insert( "weight", "normal" ); placeholderFontstyleMap.Insert( "slant", "oblique" ); placeholderMapSet["placeholderFontStyle"] = placeholderFontstyleMap; - field.SetProperty( DevelTextField::Property::PLACEHOLDER, placeholderMapSet ); + field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet ); - placeholderMapGet = field.GetProperty( DevelTextField::Property::PLACEHOLDER ); + placeholderMapGet = field.GetProperty( TextField::Property::PLACEHOLDER ); DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION ); DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION ); placeholderFontstyleMap.Clear(); placeholderFontstyleMap.Insert( "slant", "roman" ); placeholderMapSet["placeholderFontStyle"] = placeholderFontstyleMap; - field.SetProperty( DevelTextField::Property::PLACEHOLDER, placeholderMapSet ); + field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet ); - placeholderMapGet = field.GetProperty( DevelTextField::Property::PLACEHOLDER ); + placeholderMapGet = field.GetProperty( TextField::Property::PLACEHOLDER ); placeholderFontstyleMap.Clear(); placeholderMapSet["placeholderFontStyle"] = placeholderFontstyleMap; - field.SetProperty( DevelTextField::Property::PLACEHOLDER, placeholderMapSet ); - placeholderMapGet = field.GetProperty( DevelTextField::Property::PLACEHOLDER ); + field.SetProperty( TextField::Property::PLACEHOLDER, placeholderMapSet ); + placeholderMapGet = field.GetProperty( TextField::Property::PLACEHOLDER ); DALI_TEST_EQUALS( placeholderMapGet.Count(), placeholderMapSet.Count(), TEST_LOCATION ); DALI_TEST_EQUALS( DaliTestCheckMaps( placeholderMapGet, placeholderMapSet ), true, TEST_LOCATION ); // Check the ellipsis property - DALI_TEST_CHECK( !field.GetProperty( DevelTextField::Property::ELLIPSIS ) ); - field.SetProperty( DevelTextField::Property::ELLIPSIS, true ); - DALI_TEST_CHECK( field.GetProperty( DevelTextField::Property::ELLIPSIS ) ); + DALI_TEST_CHECK( !field.GetProperty( TextField::Property::ELLIPSIS ) ); + field.SetProperty( TextField::Property::ELLIPSIS, true ); + DALI_TEST_CHECK( field.GetProperty( TextField::Property::ELLIPSIS ) ); END_TEST; } @@ -2158,21 +2156,21 @@ int utcDaliTextFieldEvent09(void) Property::Map map; map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_NONE; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map ); + field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map ); application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::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 ); + field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map ); application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); application.SendNotification(); application.Render(); map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::HIDE_COUNT; map[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 2; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map ); + field.SetProperty( TextField::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, Device::Class::NONE, Device::Subclass::NONE ) ); @@ -2182,7 +2180,7 @@ int utcDaliTextFieldEvent09(void) map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::SHOW_COUNT; map[ HiddenInput::Property::SUBSTITUTE_COUNT ] = 2; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map ); + field.SetProperty( TextField::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, Device::Class::NONE, Device::Subclass::NONE ) ); @@ -2191,8 +2189,8 @@ int utcDaliTextFieldEvent09(void) } map[ HiddenInput::Property::MODE ] = HiddenInput::Mode::SHOW_LAST_CHARACTER; - map[ HiddenInput::Property::SHOW_DURATION ] = 0; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map ); + map[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 0; + field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map ); application.ProcessEvent( GenerateKey( "", "", DALI_KEY_BACKSPACE, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); application.SendNotification(); application.Render(); @@ -2200,14 +2198,14 @@ int utcDaliTextFieldEvent09(void) application.SendNotification(); application.Render(); - map[ HiddenInput::Property::SHOW_DURATION ] = 100; - field.SetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS, map ); + map[ HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION ] = 100; + field.SetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS, map ); application.ProcessEvent( GenerateKey( "d", "d", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE ) ); application.SendNotification(); application.Render(); Property::Map mapGet; - mapGet = field.GetProperty( DevelTextField::Property::HIDDEN_INPUT_SETTINGS ); + mapGet = field.GetProperty( TextField::Property::HIDDEN_INPUT_SETTINGS ); DALI_TEST_EQUALS( map.Count(), mapGet.Count(), TEST_LOCATION ); DALI_TEST_EQUALS( DaliTestCheckMaps( map, mapGet ), true, TEST_LOCATION ); END_TEST; diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h index bb75489..bc1ffa2 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h deleted file mode 100644 index 4369126..0000000 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ /dev/null @@ -1,149 +0,0 @@ -#ifndef DALI_TOOLKIT_TEXT_FIELD_DEVEL_H -#define DALI_TOOLKIT_TEXT_FIELD_DEVEL_H - -/* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace Toolkit -{ - -namespace DevelTextField -{ - -namespace Property -{ - enum Type - { - RENDERING_BACKEND = Dali::Toolkit::TextField::Property::RENDERING_BACKEND, - TEXT = Dali::Toolkit::TextField::Property::TEXT, - PLACEHOLDER_TEXT = Dali::Toolkit::TextField::Property::PLACEHOLDER_TEXT, - PLACEHOLDER_TEXT_FOCUSED = Dali::Toolkit::TextField::Property::PLACEHOLDER_TEXT_FOCUSED, - FONT_FAMILY = Dali::Toolkit::TextField::Property::FONT_FAMILY, - FONT_STYLE = Dali::Toolkit::TextField::Property::FONT_STYLE, - POINT_SIZE = Dali::Toolkit::TextField::Property::POINT_SIZE, - MAX_LENGTH = Dali::Toolkit::TextField::Property::MAX_LENGTH, - EXCEED_POLICY = Dali::Toolkit::TextField::Property::EXCEED_POLICY, - HORIZONTAL_ALIGNMENT = Dali::Toolkit::TextField::Property::HORIZONTAL_ALIGNMENT, - VERTICAL_ALIGNMENT = Dali::Toolkit::TextField::Property::VERTICAL_ALIGNMENT, - TEXT_COLOR = Dali::Toolkit::TextField::Property::TEXT_COLOR, - PLACEHOLDER_TEXT_COLOR = Dali::Toolkit::TextField::Property::PLACEHOLDER_TEXT_COLOR, - SHADOW_OFFSET = Dali::Toolkit::TextField::Property::SHADOW_OFFSET, - SHADOW_COLOR = Dali::Toolkit::TextField::Property::SHADOW_COLOR, - PRIMARY_CURSOR_COLOR = Dali::Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR, - SECONDARY_CURSOR_COLOR = Dali::Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR, - ENABLE_CURSOR_BLINK = Dali::Toolkit::TextField::Property::ENABLE_CURSOR_BLINK, - CURSOR_BLINK_INTERVAL = Dali::Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL, - CURSOR_BLINK_DURATION = Dali::Toolkit::TextField::Property::CURSOR_BLINK_DURATION, - CURSOR_WIDTH = Dali::Toolkit::TextField::Property::CURSOR_WIDTH, - GRAB_HANDLE_IMAGE = Dali::Toolkit::TextField::Property::GRAB_HANDLE_IMAGE, - GRAB_HANDLE_PRESSED_IMAGE = Dali::Toolkit::TextField::Property::GRAB_HANDLE_PRESSED_IMAGE, - SCROLL_THRESHOLD = Dali::Toolkit::TextField::Property::SCROLL_THRESHOLD, - SCROLL_SPEED = Dali::Toolkit::TextField::Property::SCROLL_SPEED, - SELECTION_HANDLE_IMAGE_LEFT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_LEFT, - SELECTION_HANDLE_IMAGE_RIGHT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_IMAGE_RIGHT, - SELECTION_HANDLE_PRESSED_IMAGE_LEFT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_LEFT, - SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, - SELECTION_HANDLE_MARKER_IMAGE_LEFT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_LEFT, - SELECTION_HANDLE_MARKER_IMAGE_RIGHT = Dali::Toolkit::TextField::Property::SELECTION_HANDLE_MARKER_IMAGE_RIGHT, - SELECTION_HIGHLIGHT_COLOR = Dali::Toolkit::TextField::Property::SELECTION_HIGHLIGHT_COLOR, - DECORATION_BOUNDING_BOX = Dali::Toolkit::TextField::Property::DECORATION_BOUNDING_BOX, - INPUT_METHOD_SETTINGS = Dali::Toolkit::TextField::Property::INPUT_METHOD_SETTINGS, - INPUT_COLOR = Dali::Toolkit::TextField::Property::INPUT_COLOR, - ENABLE_MARKUP = Dali::Toolkit::TextField::Property::ENABLE_MARKUP, - INPUT_FONT_FAMILY = Dali::Toolkit::TextField::Property::INPUT_FONT_FAMILY, - INPUT_FONT_STYLE = Dali::Toolkit::TextField::Property::INPUT_FONT_STYLE, - INPUT_POINT_SIZE = Dali::Toolkit::TextField::Property::INPUT_POINT_SIZE, - UNDERLINE = Dali::Toolkit::TextField::Property::UNDERLINE, - INPUT_UNDERLINE = Dali::Toolkit::TextField::Property::INPUT_UNDERLINE, - SHADOW = Dali::Toolkit::TextField::Property::SHADOW, - INPUT_SHADOW = Dali::Toolkit::TextField::Property::INPUT_SHADOW, - EMBOSS = Dali::Toolkit::TextField::Property::EMBOSS, - INPUT_EMBOSS = Dali::Toolkit::TextField::Property::INPUT_EMBOSS, - OUTLINE = Dali::Toolkit::TextField::Property::OUTLINE, - INPUT_OUTLINE = Dali::Toolkit::TextField::Property::INPUT_OUTLINE, - - /** - * @brief Hides the input characters and instead shows a default character for password or pin entry. - * @details name "hiddenInputSettings", type map. - * @note Optional. - * This property is currently being used for some applications, so it can't be changed. - * @see HiddenInput - */ - HIDDEN_INPUT_SETTINGS = INPUT_OUTLINE + 1, - - /** - * @brief The size of font in pixels. - * - * Conversion from Point size to Pixel size : - * Pixel size = Point size * DPI / 72 - * @details name "pixelSize", type float - */ - PIXEL_SIZE = INPUT_OUTLINE + 2, - - /** - * @brief Enables Text selection, such as the cursor, handle, clipboard, and highlight color. - * @details name "enableSelection", type bool - */ - ENABLE_SELECTION = INPUT_OUTLINE + 3, - - /** - * @brief Sets the placeholder : text, color, font family, font style, point size, and pixel size. - * - * @code - * Property::Map propertyMap; - * propertyMap["placeholderText"] = "Setting Placeholder Text"; - * propertyMap["placeholderTextFocused"] = "Setting Placeholder Text Focused"; - * propertyMap["placeholderColor"] = Color::RED; - * propertyMap["placeholderFontFamily"] = "Arial"; - * propertyMap["placeholderPointSize"] = 12.0f; - * propertyMap["placeholderEllipsis"] = true; - * - * Property::Map fontStyleMap; - * fontStyleMap.Insert( "weight", "bold" ); - * fontStyleMap.Insert( "width", "condensed" ); - * fontStyleMap.Insert( "slant", "italic" ); - * propertyMap["placeholderFontStyle"] = fontStyleMap; - * - * field.SetProperty( DevelTextField::Property::PLACEHOLDER, propertyMap ); - * @endcode - * - * @details name "placeholder", type MAP - */ - PLACEHOLDER = INPUT_OUTLINE + 4, - - /** - * @brief Enable or disable the ellipsis. - * @details name "ellipsis", type Property::BOOLEAN. - * @note PLACEHOLDER map is used to add ellipsis to placeholder text. - */ - ELLIPSIS = INPUT_OUTLINE + 5 - }; -} // namespace Property - -} // namespace DevelText - -} // namespace Toolkit - -} // namespace Dali - -#endif // DALI_TOOLKIT_TEXT_FIELD_DEVEL_H diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 17fb99d..8965e8c 100644 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -123,9 +123,7 @@ devel_api_super_blur_view_header_files = \ $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h 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-selection-popup.h \ $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h 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 daf5c6e..a2d6b44 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -138,11 +137,11 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "emboss", DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputEmboss", MAP, INPUT_EMBOSS ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "outline", MAP, OUTLINE ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "inputOutline", MAP, INPUT_OUTLINE ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "hiddenInputSettings", MAP, HIDDEN_INPUT_SETTINGS ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "pixelSize", FLOAT, PIXEL_SIZE ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "enableSelection", BOOLEAN, ENABLE_SELECTION ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholder", MAP, PLACEHOLDER ) -DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextField, "ellipsis", BOOLEAN, ELLIPSIS ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "hiddenInputSettings", MAP, HIDDEN_INPUT_SETTINGS ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "pixelSize", FLOAT, PIXEL_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableSelection", BOOLEAN, ENABLE_SELECTION ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholder", MAP, PLACEHOLDER ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "ellipsis", BOOLEAN, ELLIPSIS ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "textChanged", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "maxLengthReached", SIGNAL_MAX_LENGTH_REACHED ) @@ -731,7 +730,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::DevelTextField::Property::HIDDEN_INPUT_SETTINGS: + case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: { const Property::Map* map = value.GetMap(); if (map) @@ -740,7 +739,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::DevelTextField::Property::PIXEL_SIZE: + case Toolkit::TextField::Property::PIXEL_SIZE: { if( impl.mController ) { @@ -754,7 +753,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::DevelTextField::Property::ENABLE_SELECTION: + case Toolkit::TextField::Property::ENABLE_SELECTION: { if( impl.mController ) { @@ -764,7 +763,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::DevelTextField::Property::PLACEHOLDER: + case Toolkit::TextField::Property::PLACEHOLDER: { const Property::Map* map = value.GetMap(); if( map ) @@ -773,7 +772,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::DevelTextField::Property::ELLIPSIS: + case Toolkit::TextField::Property::ELLIPSIS: { if( impl.mController ) { @@ -1147,14 +1146,14 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT ); break; } - case Toolkit::DevelTextField::Property::HIDDEN_INPUT_SETTINGS: + case Toolkit::TextField::Property::HIDDEN_INPUT_SETTINGS: { Property::Map map; impl.mController->GetHiddenInputOption(map); value = map; break; } - case Toolkit::DevelTextField::Property::PIXEL_SIZE: + case Toolkit::TextField::Property::PIXEL_SIZE: { if( impl.mController ) { @@ -1162,7 +1161,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::DevelTextField::Property::ENABLE_SELECTION: + case Toolkit::TextField::Property::ENABLE_SELECTION: { if( impl.mController ) { @@ -1170,14 +1169,14 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::DevelTextField::Property::PLACEHOLDER: + case Toolkit::TextField::Property::PLACEHOLDER: { Property::Map map; impl.mController->GetPlaceholderProperty( map ); value = map; break; } - case Toolkit::DevelTextField::Property::ELLIPSIS: + case Toolkit::TextField::Property::ELLIPSIS: { if( impl.mController ) { diff --git a/dali-toolkit/internal/text/hidden-text.cpp b/dali-toolkit/internal/text/hidden-text.cpp index f938430..b0e92c3 100644 --- a/dali-toolkit/internal/text/hidden-text.cpp +++ b/dali-toolkit/internal/text/hidden-text.cpp @@ -74,7 +74,7 @@ void HiddenText::SetProperties( const Property::Map& map ) { value.Get( mSubstituteCount ); } - else if( key == Toolkit::HiddenInput::Property::SHOW_DURATION || key == PROPERTY_SHOW_DURATION ) + else if( key == Toolkit::HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION || key == PROPERTY_SHOW_DURATION ) { value.Get( mDisplayDuration ); } @@ -86,7 +86,7 @@ void HiddenText::GetProperties( Property::Map& map ) map[Toolkit::HiddenInput::Property::MODE] = mHideMode; map[Toolkit::HiddenInput::Property::SUBSTITUTE_CHARACTER] = mSubstituteText; map[Toolkit::HiddenInput::Property::SUBSTITUTE_COUNT] = mSubstituteCount; - map[Toolkit::HiddenInput::Property::SHOW_DURATION] = mDisplayDuration; + map[Toolkit::HiddenInput::Property::SHOW_LAST_CHARACTER_DURATION] = mDisplayDuration; } void HiddenText::Substitute( const Vector& source, Vector& destination ) diff --git a/dali-toolkit/internal/text/hidden-text.h b/dali-toolkit/internal/text/hidden-text.h index 10d1f54..90ca9f8 100644 --- a/dali-toolkit/internal/text/hidden-text.h +++ b/dali-toolkit/internal/text/hidden-text.h @@ -23,7 +23,7 @@ #include // INTERNAL INCLUDES -#include +#include #include namespace Dali diff --git a/dali-toolkit/devel-api/controls/text-controls/hidden-input-properties.h b/dali-toolkit/public-api/controls/text-controls/hidden-input-properties.h similarity index 57% rename from dali-toolkit/devel-api/controls/text-controls/hidden-input-properties.h rename to dali-toolkit/public-api/controls/text-controls/hidden-input-properties.h index 4cbafaa..4f7c503 100644 --- a/dali-toolkit/devel-api/controls/text-controls/hidden-input-properties.h +++ b/dali-toolkit/public-api/controls/text-controls/hidden-input-properties.h @@ -1,5 +1,5 @@ -#ifndef __DALI_HIDDEN_TEXT_PROPERTIES_H__ -#define __DALI_HIDDEN_TEXT_PROPERTIES_H__ +#ifndef DALI_HIDDEN_INPUT_PROPERTIES_H +#define DALI_HIDDEN_INPUT_PROPERTIES_H /* * Copyright (c) 2017 Samsung Electronics Co., Ltd. @@ -18,36 +18,37 @@ * */ -// EXTERNAL INCLUDES - -// INTERNAL INCLUDES - namespace Dali { namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls_text_controls + * @{ + */ + namespace HiddenInput { /** - * @brief HiddenInput Property - * @SINCE_1_2.33 + * @brief HiddenInput Property. + * @SINCE_1_2.60 */ namespace Property { /** - * @brief HiddenInput Property - * @SINCE_1_2.33 + * @brief HiddenInput Property. + * @SINCE_1_2.60 */ enum { /** * @brief The mode for input text display. - * @details Name "mode", type HiddenInput::Mode or INTEGER. - * @SINCE_1_2.33 + * @details Name "mode", type HiddenInput::Mode (Property::INTEGER). + * @SINCE_1_2.60 * @note Optional. * @see HiddenInput::Mode */ @@ -55,57 +56,61 @@ enum /** * @brief All input characters are substituted by this character. - * @details Name "substituteCharacter", type INTEGER. - * @SINCE_1_2.33 + * @details Name "substituteCharacter", type Property::INTEGER. + * @SINCE_1_2.60 * @note Optional. */ SUBSTITUTE_CHARACTER, /** * @brief Length of text to show or hide, available when HIDE_COUNT/SHOW_COUNT mode is used. - * @details Name "substituteCount", type INTEGER. - * @SINCE_1_2.33 + * @details Name "substituteCount", type Property::INTEGER. + * @SINCE_1_2.60 * @note Optional. */ SUBSTITUTE_COUNT, /** * @brief Hide last character after this duration, available when SHOW_LAST_CHARACTER mode. - * @details Name "showDuration", type INTEGER. - * @SINCE_1_2.33 + * @details Name "showDuration", type Property::INTEGER. + * @SINCE_1_2.60 * @note Optional. */ - SHOW_DURATION + SHOW_LAST_CHARACTER_DURATION }; } // namespace Property /** * @brief The type for HiddenInput::Property::MODE. - * @SINCE_1_2.33 + * @SINCE_1_2.60 */ namespace Mode { /** * @brief The type for HiddenInput::Property::MODE. - * @SINCE_1_2.33 + * @SINCE_1_2.60 */ enum Type { - HIDE_NONE, ///< Don't hide text - HIDE_ALL, ///< Hide all the input text - HIDE_COUNT, ///< Hide n characters from start - SHOW_COUNT, ///< Show n characters from start - SHOW_LAST_CHARACTER ///< Show last character for the duration(use SHOW_DURATION property to modify duration) + HIDE_NONE, ///< Do not hide text. @SINCE_1_2.60 + HIDE_ALL, ///< Hide all the input text. @SINCE_1_2.60 + HIDE_COUNT, ///< Hide n characters from start. @SINCE_1_2.60 + SHOW_COUNT, ///< Show n characters from start. @SINCE_1_2.60 + SHOW_LAST_CHARACTER ///< Show last character for the duration (use Property::SHOW_LAST_CHARACTER_DURATION to modify duration). @SINCE_1_2.60 }; } // namespace Mode } // namespace HiddenInput +/** + * @} + */ + } // namespace Toolkit } // namespace Dali -#endif // __DALI_HIDDEN_TEXT_PROPERTIES_H__ +#endif // DALI_HIDDEN_INPUT_PROPERTIES_H diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index c951a2d..48e0ef5 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_FIELD_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,53 +72,397 @@ public: */ enum { - RENDERING_BACKEND = PROPERTY_START_INDEX, ///< name "renderingBackend", The type or rendering e.g. bitmap-based, type INT @SINCE_1_0.0 - TEXT, ///< name "text", The text to display in UTF-8 format, type STRING @SINCE_1_0.0 - PLACEHOLDER_TEXT, ///< name "placeholderText", The text to display when the TextField is empty and inactive, type STRING @SINCE_1_0.0 - PLACEHOLDER_TEXT_FOCUSED, ///< name "placeholderTextFocused", The text to display when the TextField is empty with key-input focus, type STRING @SINCE_1_0.0 - FONT_FAMILY, ///< name "fontFamily", The requested font family, type STRING @SINCE_1_0.0 - FONT_STYLE, ///< name "fontStyle", The requested font style, type STRING or MAP @SINCE_1_2.13 - POINT_SIZE, ///< name "pointSize", The size of font in points (Conversion from Pixel size to Point size : Point size = Pixel size * 72 / DPI), type FLOAT @SINCE_1_0.0 - MAX_LENGTH, ///< name "maxLength" The maximum number of characters that can be inserted, type INTEGER @SINCE_1_0.0 - EXCEED_POLICY, ///< name "exceedPolicy" Specifies how the text is truncated when it does not fit, type INTEGER @SINCE_1_0.0 - HORIZONTAL_ALIGNMENT, ///< name "horizontalAlignment", The line horizontal alignment, type STRING, values "BEGIN", "CENTER", "END" @SINCE_1_0.0 - VERTICAL_ALIGNMENT, ///< name "verticalAlignment", The line vertical alignment, type STRING, values "TOP", "CENTER", "BOTTOM" @SINCE_1_0.0 - TEXT_COLOR, ///< name "textColor", The text color, type VECTOR4 @SINCE_1_0.0 - PLACEHOLDER_TEXT_COLOR, ///< name "placeholderTextColor", The placeholder-text color, type VECTOR4 @SINCE_1_0.0 - SHADOW_OFFSET, ///< name "shadowOffset", The drop shadow offset 0 indicates no shadow, type VECTOR2 @DEPRECATED_1_1.37 Use SHADOW instead. - SHADOW_COLOR, ///< name "shadowColor", The color of a drop shadow, type VECTOR4 @DEPRECATED_1_1.37 Use SHADOW instead. - PRIMARY_CURSOR_COLOR, ///< name "primaryCursorColor", The color to apply to the primary cursor, type VECTOR4 @SINCE_1_0.0 - SECONDARY_CURSOR_COLOR, ///< name "secondaryCursorColor", The color to apply to the secondary cursor, type VECTOR4 @SINCE_1_0.0 - ENABLE_CURSOR_BLINK, ///< name "enableCursorBlink", Whether the cursor should blink or not, type BOOLEAN @SINCE_1_0.0 - CURSOR_BLINK_INTERVAL, ///< name "cursorBlinkInterval", The time interval in seconds between cursor on/off states, type FLOAT @SINCE_1_0.0 - CURSOR_BLINK_DURATION, ///< name "cursorBlinkDuration", The cursor will stop blinking after this number of seconds (if non-zero), type FLOAT @SINCE_1_0.0 - CURSOR_WIDTH, ///< name "cursorWidth", The cursor width, type INTEGER @SINCE_1_0.0 - GRAB_HANDLE_IMAGE, ///< name "grabHandleImage", The image to display for the grab handle, type STRING @SINCE_1_0.0 - GRAB_HANDLE_PRESSED_IMAGE, ///< name "grabHandlePressedImage", The image to display when the grab handle is pressed, type STRING @SINCE_1_0.0 - SCROLL_THRESHOLD, ///< name "scrollThreshold" Horizontal scrolling will occur if the cursor is this close to the control border, type FLOAT @SINCE_1_0.0 - SCROLL_SPEED, ///< name "scrollSpeed" The scroll speed in pixels per second, type FLOAT @SINCE_1_0.0 - SELECTION_HANDLE_IMAGE_LEFT, ///< name "selectionHandleImageLeft", The image to display for the left selection handle, type MAP @SINCE_1_0.0 - SELECTION_HANDLE_IMAGE_RIGHT, ///< name "selectionHandleImageRight", The image to display for the right selection handle, type MAP @SINCE_1_0.0 - SELECTION_HANDLE_PRESSED_IMAGE_LEFT, ///< name "selectionHandlePressedImageLeft", The image to display when the left selection handle is pressed, type MAP @SINCE_1_0.0 - SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, ///< name "selectionHandlePressedImageRight", The image to display when the right selection handle is pressed, type MAP @SINCE_1_0.0 - SELECTION_HANDLE_MARKER_IMAGE_LEFT, ///< name "selectionHandleMarkerImageLeft", The image to display for the left selection handle marker, type MAP @SINCE_1_0.0 - SELECTION_HANDLE_MARKER_IMAGE_RIGHT, ///< name "selectionHandleMarkerImageRight", The image to display for the right selection handle marker, type MAP @SINCE_1_0.0 - SELECTION_HIGHLIGHT_COLOR, ///< name "selectionHighlightColor", The color of the selection highlight, type VECTOR4 @SINCE_1_0.0 - DECORATION_BOUNDING_BOX, ///< name "decorationBoundingBox", The decorations (handles etc) will positioned within this area on-screen, type RECTANGLE @SINCE_1_0.0 - INPUT_METHOD_SETTINGS, ///< name "inputMethodSettings", The settings to relating to the System's Input Method, Key and Value type MAP @SINCE_1_0.0 - INPUT_COLOR, ///< name "inputColor", The color of the new input text, type VECTOR4 @SINCE_1_0.0 - ENABLE_MARKUP, ///< name "enableMarkup", Whether the mark-up processing is enabled. type BOOLEAN @SINCE_1_0.0 - INPUT_FONT_FAMILY, ///< name "inputFontFamily", The font's family of the new input text, type STRING @SINCE_1_0.0 - INPUT_FONT_STYLE, ///< name "inputFontStyle", The font's style of the new input text, type STRING or MAP @SINCE_1_2.13 - INPUT_POINT_SIZE, ///< name "inputPointSize", The font's size of the new input text in points, type FLOAT @SINCE_1_0.0 - UNDERLINE, ///< name "underline" The default underline parameters, type STRING or MAP @SINCE_1_2.13 - INPUT_UNDERLINE, ///< name "inputUnderline" The underline parameters of the new input text, type STRING or MAP @SINCE_1_2.13 - SHADOW, ///< name "shadow" The default shadow parameters, type STRING or MAP @SINCE_1_2.13 - INPUT_SHADOW, ///< name "inputShadow" The shadow parameters of the new input text, type STRING or MAP @SINCE_1_2.13 - EMBOSS, ///< name "emboss" The default emboss parameters, type STRING or MAP @SINCE_1_2.13 - INPUT_EMBOSS, ///< name "inputEmboss" The emboss parameters of the new input text, type STRING or MAP @SINCE_1_2.13 - OUTLINE, ///< name "outline" The default outline parameters, type STRING or MAP @SINCE_1_2.13 - INPUT_OUTLINE, ///< name "inputOutline" The outline parameters of the new input text, type STRING or MAP @SINCE_1_2.13 + /** + * @brief The type or rendering e.g. bitmap-based. + * @details Name "renderingBackend", type Property::INTEGER. + * @SINCE_1_0.0 + */ + RENDERING_BACKEND = PROPERTY_START_INDEX, + + /** + * @brief The text to display in UTF-8 format. + * @details Name "text", type Property::STRING. + * @SINCE_1_0.0 + */ + TEXT, + + /** + * @brief The text to display when the TextField is empty and inactive. + * @details Name "placeholderText", type Property::STRING. + * @SINCE_1_0.0 + */ + PLACEHOLDER_TEXT, + + /** + * @brief The text to display when the TextField is empty with key-input focus. + * @details Name "placeholderTextFocused", type Property::STRING. + * @SINCE_1_0.0 + */ + PLACEHOLDER_TEXT_FOCUSED, + + /** + * @brief The requested font family. + * @details Name "fontFamily", type Property::STRING. + * @SINCE_1_0.0 + */ + FONT_FAMILY, + + /** + * @brief The requested font style + * @details Name "fontStyle", type Property::STRING or Property::MAP. + * @SINCE_1_2.13 + */ + FONT_STYLE, + + /** + * @brief The size of font in points. + * @details Name "pointSize", type Property::FLOAT. + * (Conversion from Pixel size to Point size : Point size = Pixel size * 72 / DPI). + * @SINCE_1_0.0 + */ + POINT_SIZE, + + /** + * @brief The maximum number of characters that can be inserted. + * @details Name "maxLength", type Property::INTEGER. + * @SINCE_1_0.0 + */ + MAX_LENGTH, + + /** + * @brief Specifies how the text is truncated when it does not fit. + * @details Name "exceedPolicy", type Property::INTEGER. + * @SINCE_1_0.0 + */ + EXCEED_POLICY, + + /** + * @brief The line horizontal alignment. + * @details Name "horizontalAlignment", type Property::STRING. + * Values "BEGIN", "CENTER", "END". + * @SINCE_1_0.0 + */ + HORIZONTAL_ALIGNMENT, + + /** + * @brief The line vertical alignment. + * @details Name "verticalAlignment", type Property::STRING. + * Values "TOP", "CENTER", "BOTTOM". + * @SINCE_1_0.0 + */ + VERTICAL_ALIGNMENT, + + /** + * @brief The text color. + * @details Name "textColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + TEXT_COLOR, + + /** + * @brief The placeholder-text color. + * @details Name "placeholderTextColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + PLACEHOLDER_TEXT_COLOR, + + /** + * @DEPRECATED_1_1.37 Use SHADOW instead. + * @brief The drop shadow offset 0 indicates no shadow. + * @details Name "shadowOffset", type Property::VECTOR2. + * @SINCE_1_0.0 + */ + SHADOW_OFFSET, + + /** + * @DEPRECATED_1_1.37 Use SHADOW instead. + * @brief The color of a drop shadow. + * @details Name "shadowColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + SHADOW_COLOR, + + /** + * @brief The color to apply to the primary cursor. + * @details Name "primaryCursorColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + PRIMARY_CURSOR_COLOR, + + /** + * @brief The color to apply to the secondary cursor. + * @details Name "secondaryCursorColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + SECONDARY_CURSOR_COLOR, + + /** + * @brief Whether the cursor should blink or not. + * @details Name "enableCursorBlink", type Property::BOOLEAN. + * @SINCE_1_0.0 + */ + ENABLE_CURSOR_BLINK, + + /** + * @brief The time interval in seconds between cursor on/off states. + * @details Name "cursorBlinkInterval", type Property::FLOAT. + * @SINCE_1_0.0 + */ + CURSOR_BLINK_INTERVAL, + + /** + * @brief The cursor will stop blinking after this number of seconds (if non-zero) + * @details Name "cursorBlinkDuration", type Property::FLOAT. + * @SINCE_1_0.0 + */ + CURSOR_BLINK_DURATION, + + /** + * @brief The cursor width. + * @details Name "cursorWidth", type Property::INTEGER. + * @SINCE_1_0.0 + */ + CURSOR_WIDTH, + + /** + * @brief The image to display for the grab handle. + * @details Name "grabHandleImage", type Property::STRING. + * @SINCE_1_0.0 + */ + GRAB_HANDLE_IMAGE, + + /** + * @brief The image to display when the grab handle is pressed + * @details Name "grabHandlePressedImage", type Property::STRING. + * @SINCE_1_0.0 + */ + GRAB_HANDLE_PRESSED_IMAGE, + + /** + * @brief Horizontal scrolling will occur if the cursor is this close to the control border. + * @details Name "scrollThreshold", type Property::FLOAT. + * @SINCE_1_0.0 + */ + SCROLL_THRESHOLD, + + /** + * @brief The scroll speed in pixels per second. + * @details Name "scrollSpeed", type Property::FLOAT. + * @SINCE_1_0.0 + */ + SCROLL_SPEED, + + /** + * @brief The image to display for the left selection handle. + * @details Name "selectionHandleImageLeft", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_IMAGE_LEFT, + + /** + * @brief The image to display for the right selection handle. + * @details Name "selectionHandleImageRight", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_IMAGE_RIGHT, + + /** + * @brief The image to display when the left selection handle is pressed. + * @details Name "selectionHandlePressedImageLeft", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_PRESSED_IMAGE_LEFT, + + /** + * @brief The image to display when the right selection handle is pressed. + * @details Name "selectionHandlePressedImageRight", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_PRESSED_IMAGE_RIGHT, + + /** + * @brief The image to display for the left selection handle marker. + * @details Name "selectionHandleMarkerImageLeft", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_MARKER_IMAGE_LEFT, + + /** + * @brief The image to display for the right selection handle marker. + * @details Name "selectionHandleMarkerImageRight", type Property::MAP. + * @SINCE_1_0.0 + */ + SELECTION_HANDLE_MARKER_IMAGE_RIGHT, + + /** + * @brief The color of the selection highlight. + * @details Name "selectionHighlightColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + SELECTION_HIGHLIGHT_COLOR, + + /** + * @brief The decorations (handles etc) will positioned within this area on-screen. + * @details Name "decorationBoundingBox", type Property::RECTANGLE. + * @SINCE_1_0.0 + */ + DECORATION_BOUNDING_BOX, + + /** + * @brief The settings to relating to the System's Input Method, Key and Value. + * @details Name "inputMethodSettings", type Property::MAP. + * @SINCE_1_0.0 + */ + INPUT_METHOD_SETTINGS, + + /** + * @brief The color of the new input text. + * @details Name "inputColor", type Property::VECTOR4. + * @SINCE_1_0.0 + */ + INPUT_COLOR, + + /** + * @brief Whether the mark-up processing is enabled. + * @details Name "enableMarkup", type Property::BOOLEAN. + * @SINCE_1_0.0 + */ + ENABLE_MARKUP, + + /** + * @brief The font's family of the new input text. + * @details Name "inputFontFamily", type Property::STRING. + * @SINCE_1_0.0 + */ + INPUT_FONT_FAMILY, + + /** + * @brief The font's style of the new input text. + * @details Name "inputFontStyle", type Property::MAP. + * @SINCE_1_2.13 + */ + INPUT_FONT_STYLE, + + /** + * @brief The font's size of the new input text in points. + * @details Name "inputPointSize", type Property::FLOAT. + * @SINCE_1_0.0 + */ + INPUT_POINT_SIZE, + + /** + * @brief The default underline parameters. + * @details Name "underline", type Property::MAP. + * @SINCE_1_2.13 + */ + UNDERLINE, + + /** + * @brief The underline parameters of the new input text. + * @details Name "inputUnderline", type Property::MAP. + * @SINCE_1_2.13 + */ + INPUT_UNDERLINE, + + /** + * @brief The default shadow parameters. + * @details Name "shadow", type Property::MAP. + * @SINCE_1_2.13 + */ + SHADOW, + + /** + * @brief The shadow parameters of the new input text. + * @details Name "inputShadow", type Property::MAP. + * @SINCE_1_2.13 + */ + INPUT_SHADOW, + + /** + * @brief The default emboss parameters. + * @details Name "emboss", type Property::MAP. + * @SINCE_1_2.13 + */ + EMBOSS, + + /** + * @brief The emboss parameters of the new input text. + * @details Name "inputEmboss", type Property::MAP. + * @SINCE_1_2.13 + */ + INPUT_EMBOSS, + + /** + * @brief The default outline parameters. + * @details Name "outline", type Property::MAP. + * @SINCE_1_2.13 + */ + OUTLINE, + + /** + * @brief The outline parameters of the new input text. + * @details Name "inputOutline", type Property::MAP. + * @SINCE_1_2.13 + */ + INPUT_OUTLINE, + + /** + * @brief Hides the input characters and instead shows a default character for password or pin entry. + * @details Name "hiddenInputSettings", type Property::MAP. + * @SINCE_1_2.60 + * @note Optional. + * @see HiddenInput::Property + */ + HIDDEN_INPUT_SETTINGS, + + /** + * @brief The size of font in pixels. + * @details Name "pixelSize", type Property::FLOAT. + * Conversion from Point size to Pixel size: + * Pixel size = Point size * DPI / 72 + * @SINCE_1_2.60 + */ + PIXEL_SIZE, + + /** + * @brief Enables Text selection, such as the cursor, handle, clipboard, and highlight color. + * @details Name "enableSelection", type Property::BOOLEAN. + * @SINCE_1_2.60 + */ + ENABLE_SELECTION, + + /** + * @brief Sets the placeholder : text, color, font family, font style, point size, and pixel size. + * @details Name "placeholder", type Property::MAP. + * Example Usage: + * @code + * Property::Map propertyMap; + * propertyMap["placeholderText"] = "Setting Placeholder Text"; + * propertyMap["placeholderTextFocused"] = "Setting Placeholder Text Focused"; + * propertyMap["placeholderColor"] = Color::RED; + * propertyMap["placeholderFontFamily"] = "Arial"; + * propertyMap["placeholderPointSize"] = 12.0f; + * propertyMap["placeholderEllipsis"] = true; + * + * Property::Map fontStyleMap; + * fontStyleMap.Insert( "weight", "bold" ); + * fontStyleMap.Insert( "width", "condensed" ); + * fontStyleMap.Insert( "slant", "italic" ); + * propertyMap["placeholderFontStyle"] = fontStyleMap; + * + * field.SetProperty( TextField::Property::PLACEHOLDER, propertyMap ); + * @endcode + * @SINCE_1_2.60 + */ + PLACEHOLDER, + + /** + * @brief Whether we should show the ellipsis if it is required. + * @details Name "ellipsis", type Property::BOOLEAN. + * @SINCE_1_2.60 + * @note PLACEHOLDER map is used to add ellipsis to placeholder text. + */ + ELLIPSIS, }; }; diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index 275ed9c..e695d21 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -103,6 +103,7 @@ public_api_table_view_header_files = \ $(public_api_src_dir)/controls/table-view/table-view.h public_api_text_controls_header_files = \ + $(public_api_src_dir)/controls/text-controls/hidden-input-properties.h \ $(public_api_src_dir)/controls/text-controls/text-editor.h \ $(public_api_src_dir)/controls/text-controls/text-label.h \ $(public_api_src_dir)/controls/text-controls/text-field.h