{
}
-void WebEngine::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > cb )
-{
-}
-
-void WebEngine::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName )
+void WebEngine::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void(const std::string&) > handler )
{
}
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
+#include <dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h>
#include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
using namespace Dali;
const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
const unsigned int EMOJI_FONT_SIZE = 3840u; // 60 * 64
-bool DaliTestCheckMaps( const Property::Map& fontStyleMapGet, const Property::Map& fontStyleMapSet )
+bool DaliTestCheckMaps( const Property::Map& mapGet, const Property::Map& mapSet, const std::vector<std::string>& indexConversionTable = std::vector<std::string>() )
{
- if( fontStyleMapGet.Count() == fontStyleMapSet.Count() )
+ const Property::Map::SizeType size = mapGet.Count();
+
+ if( size == mapSet.Count() )
{
- for( unsigned int index = 0u; index < fontStyleMapGet.Count(); ++index )
+ for( unsigned int index = 0u; index < size; ++index )
{
- const KeyValuePair& valueGet = fontStyleMapGet.GetKeyValue( index );
+ const KeyValuePair& valueGet = mapGet.GetKeyValue( index );
- Property::Value* valueSet = NULL;
- if ( valueGet.first.type == Property::Key::INDEX )
- {
- valueSet = fontStyleMapSet.Find( valueGet.first.indexKey );
- }
- else
+ // Find the keys of the 'get' map
+ Property::Index indexKey = valueGet.first.indexKey;
+ std::string stringKey = valueGet.first.stringKey;
+
+ if( !indexConversionTable.empty() )
{
- // Get Key is a string so searching Set Map for a string key
- valueSet = fontStyleMapSet.Find( valueGet.first.stringKey );
+ if( stringKey.empty() )
+ {
+ stringKey = indexConversionTable[ indexKey ];
+ }
+
+ if( ( indexKey == Property::INVALID_INDEX ) && !stringKey.empty() )
+ {
+ Property::Index index = 0u;
+ for( auto key : indexConversionTable )
+ {
+ if( key == stringKey )
+ {
+ indexKey = index;
+ break;
+ }
+ ++index;
+ }
+ }
}
- if( NULL != valueSet )
+ const Property::Value* const valueSet = mapSet.Find( indexKey, stringKey );
+
+ if( nullptr != valueSet )
{
- if( valueSet->GetType() == Dali::Property::STRING && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
+ if( ( valueSet->GetType() == Dali::Property::STRING ) && ( valueGet.second.Get<std::string>() != valueSet->Get<std::string>() ) )
{
tet_printf( "Value got : [%s], expected : [%s]", valueGet.second.Get<std::string>().c_str(), valueSet->Get<std::string>().c_str() );
return false;
}
- else if( valueSet->GetType() == Dali::Property::BOOLEAN && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
+ else if( ( valueSet->GetType() == Dali::Property::BOOLEAN ) && ( valueGet.second.Get<bool>() != valueSet->Get<bool>() ) )
{
tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<bool>(), valueSet->Get<bool>() );
return false;
}
- else if( valueSet->GetType() == Dali::Property::INTEGER && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
+ else if( ( valueSet->GetType() == Dali::Property::INTEGER ) && ( valueGet.second.Get<int>() != valueSet->Get<int>() ) )
{
tet_printf( "Value got : [%d], expected : [%d]", valueGet.second.Get<int>(), valueSet->Get<int>() );
return false;
}
- else if( valueSet->GetType() == Dali::Property::FLOAT && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
+ else if( ( valueSet->GetType() == Dali::Property::FLOAT ) && ( valueGet.second.Get<float>() != valueSet->Get<float>() ) )
{
tet_printf( "Value got : [%f], expected : [%f]", valueGet.second.Get<float>(), valueSet->Get<float>() );
return false;
}
- else if( valueSet->GetType() == Dali::Property::VECTOR2 && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
+ else if( ( valueSet->GetType() == Dali::Property::VECTOR2 ) && ( valueGet.second.Get<Vector2>() != valueSet->Get<Vector2>() ) )
{
Vector2 vector2Get = valueGet.second.Get<Vector2>();
Vector2 vector2Set = valueSet->Get<Vector2>();
tet_printf( "Value got : [%f, %f], expected : [%f, %f]", vector2Get.x, vector2Get.y, vector2Set.x, vector2Set.y );
return false;
}
- else if( valueSet->GetType() == Dali::Property::VECTOR4 && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
+ else if( ( valueSet->GetType() == Dali::Property::VECTOR4 ) && ( valueGet.second.Get<Vector4>() != valueSet->Get<Vector4>() ) )
{
Vector4 vector4Get = valueGet.second.Get<Vector4>();
Vector4 vector4Set = valueSet->Get<Vector4>();
DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet ), true, TEST_LOCATION );
underlineMapSet.Clear();
+ underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::ENABLE, "true" );
+ underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::COLOR, "green" );
+ underlineMapSet.Insert( Toolkit::DevelText::Underline::Property::HEIGHT, "2" );
+
+ label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+
+ application.SendNotification();
+ application.Render();
+
+ underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
+ DALI_TEST_EQUALS( underlineMapGet.Count(), underlineMapSet.Count(), TEST_LOCATION );
+ std::vector<std::string> underlineIndicesConversionTable = { "enable", "color", "height" };
+ DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineMapSet, underlineIndicesConversionTable ), true, TEST_LOCATION );
+
+ underlineMapSet.Clear();
Property::Map underlineDisabledMapGet;
underlineDisabledMapGet.Insert( "enable", "false" );
- underlineDisabledMapGet.Insert( "color", "red" );
- underlineDisabledMapGet.Insert( "height", "1" );
+ underlineDisabledMapGet.Insert( "color", "green" );
+ underlineDisabledMapGet.Insert( "height", "2" );
label.SetProperty( TextLabel::Property::UNDERLINE, underlineMapSet );
+
+ application.SendNotification();
+ application.Render();
+
underlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::UNDERLINE );
DALI_TEST_EQUALS( underlineMapGet.Count(), underlineDisabledMapGet.Count(), TEST_LOCATION );
DALI_TEST_EQUALS( DaliTestCheckMaps( underlineMapGet, underlineDisabledMapGet ), true, TEST_LOCATION );
DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet ), true, TEST_LOCATION );
shadowMapSet.Clear();
+
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE );
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::OFFSET, "3.0 3.0" );
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f );
+
+ label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
+
+ // Replace the offset (string) by a vector2
+ shadowMapSet.Clear();
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::COLOR, Color::BLUE );
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::OFFSET, Vector2( 3.0, 3.0 ) );
+ shadowMapSet.Insert( Toolkit::DevelText::Shadow::Property::BLUR_RADIUS, 3.0f );
+
+ shadowMapGet = label.GetProperty<Property::Map>( TextLabel::Property::SHADOW );
+ DALI_TEST_EQUALS( shadowMapGet.Count(), shadowMapSet.Count(), TEST_LOCATION );
+ std::vector<std::string> shadowIndicesConversionTable = { "color", "offset", "blurRadius" };
+ DALI_TEST_EQUALS( DaliTestCheckMaps( shadowMapGet, shadowMapSet, shadowIndicesConversionTable ), true, TEST_LOCATION );
+
+ shadowMapSet.Clear();
Property::Map shadowDisabledMapGet;
- shadowDisabledMapGet.Insert( "color", Color::GREEN );
+ shadowDisabledMapGet.Insert( "color", Color::BLUE );
shadowDisabledMapGet.Insert( "offset", Vector2(0.0f, 0.0f) );
- shadowDisabledMapGet.Insert( "blurRadius", 5.0f );
+ shadowDisabledMapGet.Insert( "blurRadius", 3.0f );
label.SetProperty( TextLabel::Property::SHADOW, shadowMapSet );
DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet ), true, TEST_LOCATION );
+ outlineMapSet.Clear();
+ outlineMapSet[Toolkit::DevelText::Outline::Property::COLOR] = Color::BLUE;
+ outlineMapSet[Toolkit::DevelText::Outline::Property::WIDTH] = 3.0f;
+ label.SetProperty( TextLabel::Property::OUTLINE, outlineMapSet );
+
+ outlineMapGet = label.GetProperty<Property::Map>( TextLabel::Property::OUTLINE );
+ DALI_TEST_EQUALS( outlineMapGet.Count(), outlineMapSet.Count(), TEST_LOCATION );
+ std::vector<std::string> outlineIndicesConversionTable = { "color", "width" };
+ DALI_TEST_EQUALS( DaliTestCheckMaps( outlineMapGet, outlineMapSet, outlineIndicesConversionTable ), true, TEST_LOCATION );
+
// Check the background property
Property::Map backgroundMapSet;
Property::Map backgroundMapGet;
DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION );
DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet ), true, TEST_LOCATION );
+ backgroundMapSet.Clear();
+ backgroundMapSet[Toolkit::DevelText::Background::Property::ENABLE] = true;
+ backgroundMapSet[Toolkit::DevelText::Background::Property::COLOR] = Color::GREEN;
+ label.SetProperty( DevelTextLabel::Property::BACKGROUND, backgroundMapSet );
+
+ backgroundMapGet = label.GetProperty<Property::Map>( DevelTextLabel::Property::BACKGROUND );
+ DALI_TEST_EQUALS( backgroundMapGet.Count(), backgroundMapSet.Count(), TEST_LOCATION );
+ std::vector<std::string> backgroundIndicesConversionTable = { "enable", "color" };
+ DALI_TEST_EQUALS( DaliTestCheckMaps( backgroundMapGet, backgroundMapSet, backgroundIndicesConversionTable ), true, TEST_LOCATION );
+
// Check the pixel size of font
label.SetProperty( TextLabel::Property::PIXEL_SIZE, 20.f );
DALI_TEST_EQUALS( label.GetProperty<float>( TextLabel::Property::PIXEL_SIZE ), 20.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
WebView view = WebView::New( "ko-KR", "Asia/Seoul" );
view.LoadHTMLString( "<body>Hello World!</body>" );
- view.AddJavaScriptInterface( "jsObject", "jsFunction",
- []( const std::string& arg ) -> std::string {
- return arg + " World!";
+ view.AddJavaScriptMessageHandler( "jsObject",
+ []( const std::string& arg ) {
}
);
- view.EvaluateJavaScript( "jsObject.jsFunction('Hello')" );
- view.RemoveJavascriptInterface( "jsObject", "jsFunction" );
+ view.EvaluateJavaScript( "jsObject.postMessage('Hello')" );
DALI_TEST_CHECK( view );
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,
+ RESERVED_PROPERTY_01 = Dali::Toolkit::TextField::Property::RESERVED_PROPERTY_01,
+ RESERVED_PROPERTY_02 = Dali::Toolkit::TextField::Property::RESERVED_PROPERTY_02,
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,
HORIZONTAL_ALIGNMENT = Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,
VERTICAL_ALIGNMENT = Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,
UNUSED_PROPERTY_TEXT_COLOR = Dali::Toolkit::TextLabel::Property::UNUSED_PROPERTY_TEXT_COLOR,
+ RESERVED_PROPERTY_01 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_01,
+ RESERVED_PROPERTY_02 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_02,
+ RESERVED_PROPERTY_03 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_03,
+ RESERVED_PROPERTY_04 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_04,
+ RESERVED_PROPERTY_05 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_05,
ENABLE_MARKUP = Dali::Toolkit::TextLabel::Property::ENABLE_MARKUP,
ENABLE_AUTO_SCROLL = Dali::Toolkit::TextLabel::Property::ENABLE_AUTO_SCROLL,
AUTO_SCROLL_SPEED = Dali::Toolkit::TextLabel::Property::AUTO_SCROLL_SPEED,
--- /dev/null
+#ifndef DALI_TOOLKIT_TEXT_STYLE_PROPERTIES_DEVEL_H
+#define DALI_TOOLKIT_TEXT_STYLE_PROPERTIES_DEVEL_H
+
+/*
+ * Copyright (c) 2019 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.
+ *
+ */
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+/**
+ * @addtogroup dali_toolkit_controls
+ * @{
+ */
+
+namespace DevelText
+{
+
+namespace Shadow
+{
+
+/**
+ * @brief Used by Text controls to show different styles of text.
+ *
+ */
+namespace Property
+{
+
+enum
+{
+ /**
+ * @brief The color of the shadow.
+ * @details Name "color", type Property::STRING or Property::VECTOR4.
+ * @note Optional. If not provided the default color (BLACK) is used.
+ */
+ COLOR,
+
+ /**
+ * @brief The offset in pixels of the shadow.
+ * @details Name "offset", type Property::STRING or Property::VECTOR2. i.e "3.0 3.0" or Vector2( 3.f, 3.f )
+ * @note Optional. If not provided then the shadow is not enabled.
+ */
+ OFFSET,
+
+ /**
+ * @brief The radius of the Gaussian blur for the soft shadow.
+ * @details Name "blurRadius", type Property::STRING or Property::FLOAT. i.e "5.0" or 5.f
+ * @note Optional. If not provided then the soft shadow is not enabled.
+ */
+ BLUR_RADIUS
+};
+
+} // namespace Property
+
+} // namespace Shadow
+
+namespace Underline
+{
+
+namespace Property
+{
+
+enum
+{
+ /**
+ * @brief Whether the underline is enabled.
+ * @details Name "enable", type Property::STRING or Property::BOOLEAN. i.e. "true", "false", true or false
+ * @note Optional. By default is disabled.
+ */
+ ENABLE,
+
+ /**
+ * @brief The color of the underline.
+ * @details Name "color", type Property::STRING or Property::VECTOR4
+ * @note Optional. If not provided then the color of the text is used.
+ */
+ COLOR,
+
+ /**
+ * @brief The height in pixels of the underline.
+ * @details Name "height", type Property::STRING or Property::FLOAT. i.e. "1.0" or 1.f
+ * @note Optional. If not provided then the default height is used (1 pixel).
+ */
+ HEIGHT
+};
+
+} // namespace Property
+
+} // namespace Underline
+
+namespace Outline
+{
+
+namespace Property
+{
+
+enum
+{
+ /**
+ * @brief The color of the outline.
+ * @details Name "color", type Property::STRING or Property::VECTOR4
+ * @note Optional. If not provided the default color (WHITE) is used.
+ */
+ COLOR,
+
+ /**
+ * @brief The width in pixels of the outline.
+ * @details Name "width", type Property::STRING or Property::FLOAT i.e. "1.0" or 1.f
+ * @note Optional. If not provided then the outline is not enabled.
+ */
+ WIDTH
+};
+
+} // namespace Property
+
+} // namespace Outline
+
+namespace Background
+{
+
+namespace Property
+{
+
+enum
+{
+ /**
+ * @brief Whether to paint the text's background.
+ * @details Name "enable", type Property::STRING or Property::BOOLEAN i.e. "true", "false", true or false
+ * @note Optional. By default is disabled.
+ */
+ ENABLE,
+
+ /**
+ * @brief The color of the background.
+ * @details Name "color", type Property::STRING or Property::VECTOR4
+ * @note Optional. If not provided the default color (CYAN) is used.
+ */
+ COLOR
+};
+
+} // namespace Property
+
+} // namespace Background
+
+} // namespace DevelText
+
+/**
+ * @}
+ */
+
+} // namespace Toolkit
+
+} // namespace Dali
+
+#endif // DALI_TOOLKIT_TEXT_STYLE_PROPERTIES_DEVEL_H
Dali::Toolkit::GetImpl( *this ).EvaluateJavaScript( script );
}
-void WebView::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback )
+void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler )
{
- Dali::Toolkit::GetImpl( *this ).AddJavaScriptInterface( exposedObjectName, jsFunctionName, callback );
-}
-
-void WebView::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName )
-{
- Dali::Toolkit::GetImpl( *this ).RemoveJavascriptInterface( exposedObjectName, jsFunctionName );
+ Dali::Toolkit::GetImpl( *this ).AddJavaScriptMessageHandler( exposedObjectName, handler );
}
void WebView::ClearHistory()
void GoBack();
/**
- * @brief Evaluates JavaScript code represented as a string.
- *
- * @param[in] script The JavaScript code
- */
+ * @brief Evaluates JavaScript code represented as a string.
+ *
+ * @param[in] script The JavaScript code
+ */
void EvaluateJavaScript( const std::string& script );
/**
- * @brief Adds a JavaScript interface.
- *
- * @param[in] exposedObjectName The name of exposed object
- * @param[in] jsFunctionName The name of JavaScript function
- * @param[in] callback The callback function
- */
- void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback );
-
- /**
- * @brief Removes a JavaScript interface.
- *
- * @param[in] exposedObjectName The name of exposed object
- * @param[in] jsFunctionName The name of JavaScript function
- */
- void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName );
+ * @brief Inject a JavaScript object with a message handler into the WebView.
+ *
+ * @note The injected object will appear in the JavaScript context to be loaded next.
+ *
+ * Example:
+ *
+ * 1. Native
+ *
+ * webview.AddJavaScriptMessageHandler( "myObject", []( const std::string& message ) {
+ * printf( "Received a message from JS: %s", message.c_str() );
+ * });
+ *
+ * // Start WebView by loading URL
+ * webview.LoadUrl( url );
+ *
+ * 2. JavaScript
+ *
+ * myObject.postMessage( "Hello World!" ); // "Received a message from JS: Hello World!"
+ *
+ *
+ * @param[in] exposedObjectName The name of exposed object
+ * @param[in] handler The callback function
+ */
+ void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler );
/**
* @brief Clears the history of Web.
$(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
+ $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h \
+ $(devel_api_src_dir)/controls/text-controls/text-style-properties-devel.h
devel_api_text_header_files = \
$(devel_api_src_dir)/text/text-enumerations-devel.h
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "verticalAlignment", STRING, VERTICAL_ALIGNMENT )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "textColor", VECTOR4, TEXT_COLOR )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "reservedProperty01", STRING, RESERVED_PROPERTY_01 )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "reservedProperty02", STRING, RESERVED_PROPERTY_02 )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "primaryCursorColor", VECTOR4, PRIMARY_CURSOR_COLOR )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "secondaryCursorColor", VECTOR4, SECONDARY_CURSOR_COLOR )
DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enableCursorBlink", BOOLEAN, ENABLE_CURSOR_BLINK )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "horizontalAlignment", STRING, HORIZONTAL_ALIGNMENT )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "verticalAlignment", STRING, VERTICAL_ALIGNMENT )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "unusedPropertyTextColor", VECTOR4, UNUSED_PROPERTY_TEXT_COLOR )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "reservedProperty01", STRING, RESERVED_PROPERTY_01 )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "reservedProperty02", STRING, RESERVED_PROPERTY_02 )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "reservedProperty03", STRING, RESERVED_PROPERTY_03 )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "reservedProperty04", STRING, RESERVED_PROPERTY_04 )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "reservedProperty05", STRING, RESERVED_PROPERTY_05 )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "enableMarkup", BOOLEAN, ENABLE_MARKUP )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "enableAutoScroll", BOOLEAN, ENABLE_AUTO_SCROLL )
DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "autoScrollSpeed", INTEGER, AUTO_SCROLL_SPEED )
}
}
-void WebView::AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback )
+void WebView::AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler )
{
if ( mWebEngine )
{
- mWebEngine.AddJavaScriptInterface( exposedObjectName, jsFunctionName, callback );
- }
-}
-
-void WebView::RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName )
-{
- if ( mWebEngine )
- {
- mWebEngine.RemoveJavascriptInterface( exposedObjectName, jsFunctionName );
+ mWebEngine.AddJavaScriptMessageHandler( exposedObjectName, handler );
}
}
void EvaluateJavaScript( const std::string& script );
/**
- * @copydoc Dali::WebEngine::AddJavaScriptInterface()
+ * @copydoc Dali::WebEngine::AddJavaScriptMessageHandler()
*/
- void AddJavaScriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName, std::function< std::string(const std::string&) > callback );
-
- /**
- * @copydoc Dali::WebEngine::RemoveJavascriptInterface()
- */
- void RemoveJavascriptInterface( const std::string& exposedObjectName, const std::string& jsFunctionName );
+ void AddJavaScriptMessageHandler( const std::string& exposedObjectName, std::function< void( const std::string& ) > handler );
/**
* @copydoc Dali::WebEngine::ClearHistory()
/*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
#include <dali-toolkit/internal/text/text-effects-style.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/devel-api/controls/text-controls/text-style-properties-devel.h>
#include <dali-toolkit/internal/text/markup-processor-helper-functions.h>
#include <dali-toolkit/internal/text/property-string-parser.h>
{
const KeyValuePair& valueGet = shadowPropertiesMap.GetKeyValue( index );
- if( COLOR_KEY == valueGet.first.stringKey )
+ if( ( DevelText::Shadow::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) )
{
/// Color key.
colorDefined = true;
color = valueGet.second.Get<Vector4>();
}
}
- else if( OFFSET_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Shadow::Property::OFFSET == valueGet.first.indexKey ) || ( OFFSET_KEY == valueGet.first.stringKey ) )
{
/// Offset key.
offsetDefined = true;
offset = valueGet.second.Get<Vector2>();
}
}
- else if( BLUR_RADIUS_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Shadow::Property::BLUR_RADIUS == valueGet.first.indexKey ) || ( BLUR_RADIUS_KEY == valueGet.first.stringKey ) )
{
/// Blur radius key.
blurRadiusDefined = true;
{
const KeyValuePair& valueGet = underlinePropertiesMap.GetKeyValue( index );
- if( ENABLE_KEY == valueGet.first.stringKey )
+ if( ( DevelText::Underline::Property::ENABLE == valueGet.first.indexKey ) || ( ENABLE_KEY == valueGet.first.stringKey ) )
{
/// Enable key.
if( valueGet.second.GetType() == Dali::Property::STRING )
enabled = valueGet.second.Get<bool>();
}
}
- else if( COLOR_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Underline::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) )
{
/// Color key.
colorDefined = true;
color = valueGet.second.Get<Vector4>();
}
}
- else if( HEIGHT_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Underline::Property::HEIGHT == valueGet.first.indexKey ) || ( HEIGHT_KEY == valueGet.first.stringKey ) )
{
/// Height key.
heightDefined = true;
{
const KeyValuePair& valueGet = underlinePropertiesMap.GetKeyValue( index );
- if( COLOR_KEY == valueGet.first.stringKey )
+ if( ( DevelText::Outline::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) )
{
/// Color key.
colorDefined = true;
color = valueGet.second.Get<Vector4>();
}
- else if( WIDTH_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Outline::Property::WIDTH == valueGet.first.indexKey ) || ( WIDTH_KEY == valueGet.first.stringKey ) )
{
/// Width key.
widthDefined = true;
{
const KeyValuePair& valueGet = backgroundProperties.GetKeyValue( index );
- if( ENABLE_KEY == valueGet.first.stringKey )
+ if( ( DevelText::Background::Property::ENABLE == valueGet.first.indexKey ) || ( ENABLE_KEY == valueGet.first.stringKey ) )
{
/// Enable key.
enabled = valueGet.second.Get<bool>();
}
- else if( COLOR_KEY == valueGet.first.stringKey )
+ else if( ( DevelText::Background::Property::COLOR == valueGet.first.indexKey ) || ( COLOR_KEY == valueGet.first.stringKey ) )
{
/// Color key.
colorDefined = true;
PLACEHOLDER_TEXT_COLOR,
/**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_01,
+
+ /**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_02,
+
+ /**
* @brief The color to apply to the primary cursor.
* @details Name "primaryCursorColor", type Property::VECTOR4.
* @SINCE_1_0.0
UNUSED_PROPERTY_TEXT_COLOR,
/**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_01,
+
+ /**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_02,
+
+ /**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_03,
+
+ /**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_04,
+
+ /**
+ * @brief This property is removed because it's deprecated.
+ */
+ RESERVED_PROPERTY_05,
+
+ /**
* @brief Whether the mark-up processing is enabled.
* @details Name "enableMarkup", type Property::BOOLEAN.
* @SINCE_1_0.0
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 4;
-const unsigned int TOOLKIT_MICRO_VERSION = 2;
+const unsigned int TOOLKIT_MICRO_VERSION = 3;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
Name: dali-toolkit
Summary: Dali 3D engine Toolkit
-Version: 1.4.2
+Version: 1.4.3
Release: 1
Group: System/Libraries
License: Apache-2.0 and BSD-3-Clause and MIT
projects / platform / core / uifw / dali-toolkit.git / commitdiff