From 724755ab1ad6e0964a03fa7709c274f2696f55a5 Mon Sep 17 00:00:00 2001 From: ANZ1217 Date: Tue, 25 Feb 2025 16:22:33 +0900 Subject: [PATCH] Bind FONT_VARIATIONS Property Change-Id: I3c07ee6c61aa13fabd1bb1296b386067a7e77ef6 --- .../dali-toolkit/text-editor-wrap.cpp | 32 +++++++++++++++++++ .../dali-toolkit/text-field-wrap.cpp | 32 +++++++++++++++++++ .../dali-toolkit/text-label-wrap.cpp | 32 +++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp b/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp index 237d83fc..12c00e06 100755 --- a/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp +++ b/dali-csharp-binder/dali-toolkit/text-editor-wrap.cpp @@ -18,6 +18,7 @@ // EXTERNAL INCLUDES #include #include +#include // INTERNAL INCLUDES #include @@ -1338,6 +1339,37 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_REMOVE_BACK_INSET_get return (int)Dali::Toolkit::DevelTextEditor::Property::REMOVE_BACK_INSET; } +SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextEditor_Property_FONT_VARIATIONS_get() +{ + return (int)Dali::Toolkit::DevelTextEditor::Property::FONT_VARIATIONS; +} + +SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_TextEditor_RegisterFontVariationProperty(void * pTextEditor, char * pTag) +{ + Dali::Toolkit::TextEditor *textEditor = (Dali::Toolkit::TextEditor *) 0; + + if (!pTag) + { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "pTag is null string", 0); + return Dali::Property::INVALID_INDEX; + } + + std::string tag_string = std::string(pTag); + Dali::Property::Index result = Dali::Property::INVALID_INDEX; + + textEditor = (Dali::Toolkit::TextEditor *)pTextEditor; + { + try + { + auto index = Dali::Toolkit::DevelTextEditor::RegisterFontVariationProperty(*textEditor, tag_string); + result = index; + + } CALL_CATCH_EXCEPTION(Dali::Property::INVALID_INDEX); + } + + return result; +} + #ifdef __cplusplus } #endif diff --git a/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp b/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp index fe93ee5d..852b6082 100755 --- a/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp +++ b/dali-csharp-binder/dali-toolkit/text-field-wrap.cpp @@ -18,6 +18,7 @@ // EXTERNAL INCLUDES #include #include +#include // INTERNAL INCLUDES #include @@ -1113,6 +1114,37 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_REMOVE_BACK_INSET_get( return (int)Dali::Toolkit::DevelTextField::Property::REMOVE_BACK_INSET; } +SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextField_Property_FONT_VARIATIONS_get() +{ + return (int)Dali::Toolkit::DevelTextField::Property::FONT_VARIATIONS; +} + +SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_TextField_RegisterFontVariationProperty(void * pTextField, char * pTag) +{ + Dali::Toolkit::TextField *textField = (Dali::Toolkit::TextField *) 0; + + if (!pTag) + { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "pTag is null string", 0); + return Dali::Property::INVALID_INDEX; + } + + std::string tag_string = std::string(pTag); + Dali::Property::Index result = Dali::Property::INVALID_INDEX; + + textField = (Dali::Toolkit::TextField *)pTextField; + { + try + { + auto index = Dali::Toolkit::DevelTextField::RegisterFontVariationProperty(*textField, tag_string); + result = index; + + } CALL_CATCH_EXCEPTION(Dali::Property::INVALID_INDEX); + } + + return result; +} + #ifdef __cplusplus } #endif diff --git a/dali-csharp-binder/dali-toolkit/text-label-wrap.cpp b/dali-csharp-binder/dali-toolkit/text-label-wrap.cpp index 70e7e01e..fdcf9c6b 100755 --- a/dali-csharp-binder/dali-toolkit/text-label-wrap.cpp +++ b/dali-csharp-binder/dali-toolkit/text-label-wrap.cpp @@ -18,6 +18,7 @@ // EXTERNAL INCLUDES #include #include +#include // INTERNAL INCLUDES #include @@ -122,6 +123,11 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_ASYNC_LINE_COUNT_get() return (int)Dali::Toolkit::DevelTextLabel::Property::ASYNC_LINE_COUNT; } +SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_Property_FONT_VARIATIONS_get() +{ + return (int)Dali::Toolkit::DevelTextLabel::Property::FONT_VARIATIONS; +} + SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_TextLabel_GetTextSize(void * pTextLabel, unsigned int start, unsigned int end) { Dali::Toolkit::TextLabel *textLabel = (Dali::Toolkit::TextLabel *) 0; @@ -287,6 +293,32 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_TextLabel_RequestAsyncHeightForWidth(voi } } +SWIGEXPORT int32_t SWIGSTDCALL CSharp_Dali_TextLabel_RegisterFontVariationProperty(void * pTextLabel, char * pTag) +{ + Dali::Toolkit::TextLabel *textLabel = (Dali::Toolkit::TextLabel *) 0; + + if (!pTag) + { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "pTag is null string", 0); + return Dali::Property::INVALID_INDEX; + } + + std::string tag_string = std::string(pTag); + Dali::Property::Index result = Dali::Property::INVALID_INDEX; + + textLabel = (Dali::Toolkit::TextLabel *)pTextLabel; + { + try + { + auto index = Dali::Toolkit::DevelTextLabel::RegisterFontVariationProperty(*textLabel, tag_string); + result = index; + + } CALL_CATCH_EXCEPTION(Dali::Property::INVALID_INDEX); + } + + return result; +} + SWIGEXPORT int SWIGSTDCALL CSharp_Dali_TextLabel_GetLineCount(void * pTextLabel, float width) { int jresult; -- 2.34.1