#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/text/rendering/text-backend.h>
#include <dali-toolkit/internal/text/text-effects-style.h>
#include <dali-toolkit/internal/text/text-font-style.h>
DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputEmboss", MAP, INPUT_EMBOSS )
DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "outline", MAP, OUTLINE )
DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputOutline", MAP, INPUT_OUTLINE )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScroll", BOOLEAN, SMOOTH_SCROLL )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScrollDuration", FLOAT, SMOOTH_SCROLL_DURATION )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarShowDuration", FLOAT, SCROLL_BAR_SHOW_DURATION )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarFadeDuration", FLOAT, SCROLL_BAR_FADE_DURATION )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pixelSize", FLOAT, PIXEL_SIZE )
-DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "lineCount", INTEGER, LINE_COUNT )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScroll", BOOLEAN, SMOOTH_SCROLL )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "smoothScrollDuration", FLOAT, SMOOTH_SCROLL_DURATION )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableScrollBar", BOOLEAN, ENABLE_SCROLL_BAR )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarShowDuration", FLOAT, SCROLL_BAR_SHOW_DURATION )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarFadeDuration", FLOAT, SCROLL_BAR_FADE_DURATION )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pixelSize", FLOAT, PIXEL_SIZE )
+DALI_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "lineCount", INTEGER, LINE_COUNT )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableSelection", BOOLEAN, ENABLE_SELECTION )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholder", MAP, PLACEHOLDER )
+DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "lineWrapMode", STRING, LINE_WRAP_MODE )
DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderText", STRING, PLACEHOLDER_TEXT )
DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderTextColor", VECTOR4, PLACEHOLDER_TEXT_COLOR )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "enableSelection", BOOLEAN, ENABLE_SELECTION )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholder", MAP, PLACEHOLDER )
-DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "lineWrapMode", STRING, LINE_WRAP_MODE )
DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED )
DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED )
}
break;
}
- case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL:
+ case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
{
const bool enable = value.Get< bool >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SMOOTH_SCROLL %d\n", enable );
impl.mScrollAnimationEnabled = enable;
break;
}
- case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL_DURATION:
+ case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
{
const float duration = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SMOOTH_SCROLL_DURATION %f\n", duration );
}
break;
}
- case Toolkit::DevelTextEditor::Property::ENABLE_SCROLL_BAR:
+ case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
{
const bool enable = value.Get< bool >();
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor SHOW_SCROLL_BAR %d\n", enable );
impl.mScrollBarEnabled = enable;
break;
}
- case Toolkit::DevelTextEditor::Property::SCROLL_BAR_SHOW_DURATION:
+ case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
{
const float duration = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SCROLL_BAR_SHOW_DURATION %f\n", duration );
impl.mAnimationPeriod.delaySeconds = duration;
break;
}
- case Toolkit::DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION:
+ case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
{
const float duration = value.Get< float >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor SCROLL_BAR_FADE_DURATION %f\n", duration );
impl.mAnimationPeriod.durationSeconds = duration;
break;
}
- case Toolkit::DevelTextEditor::Property::PIXEL_SIZE:
+ case Toolkit::TextEditor::Property::PIXEL_SIZE:
{
if( impl.mController )
{
}
break;
}
- case Toolkit::DevelTextEditor::Property::ENABLE_SELECTION:
+ case Toolkit::TextEditor::Property::ENABLE_SELECTION:
{
if( impl.mController )
{
}
break;
}
- case Toolkit::DevelTextEditor::Property::PLACEHOLDER:
+ case Toolkit::TextEditor::Property::PLACEHOLDER:
{
const Property::Map* map = value.GetMap();
if( map )
}
break;
}
- case Toolkit::DevelTextEditor::Property::LINE_WRAP_MODE:
+ case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
{
const std::string& wrapModeStr = value.Get< std::string >();
DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p LINE_WRAP_MODE %s\n", impl.mController.Get(), wrapModeStr.c_str() );
GetOutlineProperties( impl.mController, value, Text::EffectStyle::INPUT );
break;
}
- case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL:
+ case Toolkit::TextEditor::Property::SMOOTH_SCROLL:
{
value = impl.mScrollAnimationEnabled;
break;
}
- case Toolkit::DevelTextEditor::Property::SMOOTH_SCROLL_DURATION:
+ case Toolkit::TextEditor::Property::SMOOTH_SCROLL_DURATION:
{
value = impl.mScrollAnimationDuration;
break;
}
- case Toolkit::DevelTextEditor::Property::ENABLE_SCROLL_BAR:
+ case Toolkit::TextEditor::Property::ENABLE_SCROLL_BAR:
{
value = impl.mScrollBarEnabled;
break;
}
- case Toolkit::DevelTextEditor::Property::SCROLL_BAR_SHOW_DURATION:
+ case Toolkit::TextEditor::Property::SCROLL_BAR_SHOW_DURATION:
{
value = impl.mAnimationPeriod.delaySeconds;
break;
}
- case Toolkit::DevelTextEditor::Property::SCROLL_BAR_FADE_DURATION:
+ case Toolkit::TextEditor::Property::SCROLL_BAR_FADE_DURATION:
{
value = impl.mAnimationPeriod.durationSeconds;
break;
}
- case Toolkit::DevelTextEditor::Property::PIXEL_SIZE:
+ case Toolkit::TextEditor::Property::PIXEL_SIZE:
{
if( impl.mController )
{
}
break;
}
- case Toolkit::DevelTextEditor::Property::LINE_COUNT:
+ case Toolkit::TextEditor::Property::LINE_COUNT:
{
if( impl.mController )
{
}
break;
}
- case Toolkit::DevelTextEditor::Property::ENABLE_SELECTION:
+ case Toolkit::TextEditor::Property::ENABLE_SELECTION:
{
if( impl.mController )
{
}
break;
}
- case Toolkit::DevelTextEditor::Property::PLACEHOLDER:
+ case Toolkit::TextEditor::Property::PLACEHOLDER:
{
Property::Map map;
impl.mController->GetPlaceholderProperty( map );
value = map;
break;
}
- case Toolkit::DevelTextEditor::Property::LINE_WRAP_MODE:
+ case Toolkit::TextEditor::Property::LINE_WRAP_MODE:
{
if( impl.mController )
{
return mInputStyleChangedSignal;
}
-Toolkit::DevelTextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal()
+Toolkit::TextEditor::ScrollStateChangedSignalType& TextEditor::ScrollStateChangedSignal()
{
return mScrollStateChangedSignal;
}
// Creates a background visual. Even if the color is transparent it updates the stencil.
mStencil.SetProperty( Toolkit::Control::Property::BACKGROUND,
- Property::Map().Add( Toolkit::Visual::Property::TYPE, DevelVisual::COLOR ).
+ Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ).
Add( ColorVisual::Property::MIX_COLOR, Color::TRANSPARENT ) );
// Enable the clipping property.
{
if( mRenderer )
{
+ Dali::Toolkit::TextEditor handle = Dali::Toolkit::TextEditor( GetOwner() );
+
renderableActor = mRenderer->Render( mController->GetView(),
+ handle,
+ Property::INVALID_INDEX, // Animatable property not supported
mAlignmentOffset,
DepthIndex::CONTENT );
}
// Make sure the actors are parented correctly with/without clipping
Actor self = mStencil ? mStencil : Self();
- for( std::vector<Actor>::const_iterator it = mClippingDecorationActors.begin(),
+ for( std::vector<Actor>::iterator it = mClippingDecorationActors.begin(),
endIt = mClippingDecorationActors.end();
it != endIt;
++it )
{
self.Add( *it );
- DevelActor::LowerToBottom( *it );
+ it->LowerToBottom();
}
mClippingDecorationActors.clear();
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnKeyEvent %p keyCode %d\n", mController.Get(), event.keyCode );
- if( Dali::DALI_KEY_ESCAPE == event.keyCode ) // Make a Dali key code for this
+ if( Dali::DALI_KEY_ESCAPE == event.keyCode && mController->ShouldClearFocusOnEscape() )
{
// Make sure ClearKeyInputFocus when only key is up
if( event.state == KeyEvent::Up )
{
mScrollStarted = true;
Dali::Toolkit::TextEditor handle( GetOwner() );
- mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::STARTED );
+ mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::STARTED );
}
Actor indicator = mScrollBar.GetScrollIndicator();
{
mScrollStarted = false;
Dali::Toolkit::TextEditor handle( GetOwner() );
- mScrollStateChangedSignal.Emit( handle, DevelTextEditor::Scroll::FINISHED );
+ mScrollStateChangedSignal.Emit( handle, Toolkit::TextEditor::Scroll::FINISHED );
}
}