From 00f2d3725933972d5da6cfa528944fdd7a7022ec Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 28 Feb 2018 13:18:39 +0900 Subject: [PATCH] Modify InputMethod enumeration in utc-Dali-TextField.cpp Change-Id: I52c73edda3ec3a151c343f7a071b5c85ba481b52 Signed-off-by: Seoyeon Kim --- .../src/dali-toolkit/utc-Dali-TextField.cpp | 14 +++++++------- .../public-api/controls/text-controls/text-field.h | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index ea23f76..96f0258 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -727,11 +727,11 @@ int UtcDaliTextFieldSetPropertyP(void) Property::Map propertyMap; InputMethod::PanelLayout::Type panelLayout = InputMethod::PanelLayout::NUMBER; InputMethod::AutoCapital::Type autoCapital = InputMethod::AutoCapital::WORD; - InputMethod::ActionButtonTitle::Type actionButton = InputMethod::ActionButtonTitle::GO; + InputMethod::ButtonAction::Type buttonAction = InputMethod::ButtonAction::GO; int inputVariation = 1; propertyMap["PANEL_LAYOUT"] = panelLayout; - propertyMap["AUTO_CAPITALISE"] = autoCapital; - propertyMap["ACTION_BUTTON"] = actionButton; + propertyMap["AUTO_CAPITALIZE"] = autoCapital; + propertyMap["BUTTON_ACTION"] = buttonAction; propertyMap["VARIATION"] = inputVariation; field.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, propertyMap ); @@ -744,12 +744,12 @@ int UtcDaliTextFieldSetPropertyP(void) DALI_TEST_EQUALS( static_cast(panelLayout), layout, TEST_LOCATION ); int capital = 0; - DALI_TEST_CHECK( map[ "AUTO_CAPITALISE" ].Get( capital ) ); + DALI_TEST_CHECK( map[ "AUTO_CAPITALIZE" ].Get( capital ) ); DALI_TEST_EQUALS( static_cast(autoCapital), capital, TEST_LOCATION ); int action = 0; - DALI_TEST_CHECK( map[ "ACTION_BUTTON" ].Get( action ) ); - DALI_TEST_EQUALS( static_cast(actionButton), action, TEST_LOCATION ); + DALI_TEST_CHECK( map[ "BUTTON_ACTION" ].Get( action ) ); + DALI_TEST_EQUALS( static_cast(buttonAction), action, TEST_LOCATION ); int variation = 0; DALI_TEST_CHECK( map[ "VARIATION" ].Get( variation ) ); 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 5af78b2..d2d3ae5 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -313,6 +313,26 @@ public: /** * @brief The settings to relating to the System's Input Method, Key and Value. * @details Name "inputMethodSettings", type Property::MAP. + * + * @note VARIATION key can be changed depending on PANEL_LAYOUT. + * For example, when PANEL_LAYOUT key is InputMethod::PanelLayout::NORMAL, + * then VARIATION would be among NORMAL, WITH_FILENAME, and WITH_PERSON_NAME in Dali::InputMethod::NormalLayout. + * For more information, see @ref Dali::InputMethod::Category. + * + * Example Usage: + * @code + * Property::Map propertyMap; + * InputMethod::PanelLayout::Type panelLayout = InputMethod::PanelLayout::NUMBER; + * InputMethod::AutoCapital::Type autoCapital = InputMethod::AutoCapital::WORD; + * InputMethod::ButtonAction::Type buttonAction = InputMethod::ButtonAction::GO; + * int inputVariation = 1; + * propertyMap["PANEL_LAYOUT"] = panelLayout; + * propertyMap["AUTO_CAPITALIZE"] = autoCapital; + * propertyMap["BUTTON_ACTION"] = buttonAction; + * propertyMap["VARIATION"] = inputVariation; + * + * field.SetProperty( TextField::Property::INPUT_METHOD_SETTINGS, propertyMap ); + * @endcode * @SINCE_1_0.0 */ INPUT_METHOD_SETTINGS, -- 2.7.4