};
// Default New
+ // Note: TextField and TextEditor have TextSelectionPopup
tet_infoline( "Check whether ControlStyleChangeSignal connected in default New\n");
checkup(1, Control::New());
checkup(1, ImageView::New());
checkup(1, ImageView::New("url", Dali::ImageDimensions(32u, 32u)));
checkup(1, TextLabel::New());
checkup(1, TextLabel::New("text"));
+ checkup(2, TextField::New());
+ checkup(2, TextEditor::New());
// New with additional behaviour, but enable style change signals
tet_infoline( "Check whether ControlStyleChangeSignal connected in non-disable style change signals\n");
checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT, "text"));
checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
checkup(1, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION, "text"));
+ checkup(2, TextField::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+ checkup(2, TextField::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
+ checkup(2, TextEditor::New(Toolkit::Control::ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT));
+ checkup(2, TextEditor::New(Toolkit::Control::ControlBehaviour::DISABLE_SIZE_NEGOTIATION));
// New with additional behaviour, so disable style change signals
tet_infoline( "Check whether ControlStyleChangeSignal did not connected\n");
checkup(0, ImageView::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, "url", Dali::ImageDimensions(32u, 32u)));
checkup(0, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
checkup(0, TextLabel::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS, "text"));
+ checkup(1, TextField::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
+ checkup(1, TextEditor::New(Toolkit::Control::ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS));
END_TEST;
}
} // namespace
-Toolkit::TextEditor TextEditor::New()
+Toolkit::TextEditor TextEditor::New(ControlBehaviour additionalBehaviour)
{
// Create the implementation, temporarily owned by this handle on stack
- IntrusivePtr<TextEditor> impl = new TextEditor();
+ IntrusivePtr<TextEditor> impl = new TextEditor(additionalBehaviour);
// Pass ownership to CustomActor handle
Toolkit::TextEditor handle(*impl);
mController->ChangedLayoutDirection();
}
-TextEditor::TextEditor()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+TextEditor::TextEditor(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
mAnimationPeriod(0.0f, 0.0f),
mIdleCallback(NULL),
mAlignmentOffset(0.f),
public:
/**
* @copydoc Dali::Toollkit::TextEditor::New()
+ * @param[in] additionalBehaviour custom behavior flags for this TextEditor. Default is CONTROL_BEHAVIOUR_DEFAULT
*/
- static Toolkit::TextEditor New();
+ static Toolkit::TextEditor New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
// Properties
/**
* Construct a new TextEditor.
+ *
+ * @param[in] additionalBehaviour additional behaviour flags for this TextEditor
*/
- TextEditor();
+ TextEditor(ControlBehaviour additionalBehaviour);
/**
* A reference counted object may only be deleted by calling Unreference()
} // namespace
-Toolkit::TextField TextField::New()
+Toolkit::TextField TextField::New(ControlBehaviour additionalBehaviour)
{
// Create the implementation, temporarily owned by this handle on stack
- IntrusivePtr<TextField> impl = new TextField();
+ IntrusivePtr<TextField> impl = new TextField(additionalBehaviour);
// Pass ownership to CustomActor handle
Toolkit::TextField handle(*impl);
mIdleCallback = NULL;
}
-TextField::TextField()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
+TextField::TextField(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
mIdleCallback(NULL),
mAlignmentOffset(0.f),
mRenderingBackend(DEFAULT_RENDERING_BACKEND),
public:
/**
* @copydoc Dali::Toollkit::TextField::New()
+ * @param[in] additionalBehaviour custom behavior flags for this TextField. Default is CONTROL_BEHAVIOUR_DEFAULT
*/
- static Toolkit::TextField New();
+ static Toolkit::TextField New(ControlBehaviour additionalBehaviour = ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
// Properties
/**
* Construct a new TextField.
+ *
+ * @param[in] additionalBehaviour additional behaviour flags for this TextField
*/
- TextField();
+ TextField(ControlBehaviour additionalBehaviour);
/**
* A reference counted object may only be deleted by calling Unreference()
CommonTextUtils::SynchronizeTextAnchorsInParent(Self(), mController, mAnchorActors);
}
-TextLabel::TextLabel(ControlBehaviour additionalBehavior)
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehavior)),
+TextLabel::TextLabel(ControlBehaviour additionalBehaviour)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour)),
mRenderingBackend(DEFAULT_RENDERING_BACKEND),
mTextUpdateNeeded(false),
mLastAutoScrollEnabled(false)
return Internal::TextEditor::New();
}
+TextEditor TextEditor::New(ControlBehaviour additionalBehaviour)
+{
+ return Internal::TextEditor::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
TextEditor::TextEditor()
{
}
New();
/**
+ * @brief Creates the TextEditor control with additional behaviour.
+ *
+ * @SINCE_2_2.3
+ * @param[in] additionalBehaviour Additional control behaviour
+ * @return A handle to the TextEditor control
+ */
+ static TextEditor New(ControlBehaviour additionalBehaviour);
+
+ /**
* @brief Creates an empty handle.
*
* @SINCE_1_1.37
return Internal::TextField::New();
}
+TextField TextField::New(ControlBehaviour additionalBehaviour)
+{
+ return Internal::TextField::New(static_cast<Toolkit::Internal::Control::ControlBehaviour>(additionalBehaviour));
+}
+
TextField::TextField()
{
}
static TextField New();
/**
+ * @brief Creates the TextField control with additional behaviour.
+ *
+ * @SINCE_2_2.3
+ * @param[in] additionalBehaviour Additional control behaviour
+ * @return A handle to the TextField control
+ */
+ static TextField New(ControlBehaviour additionalBehaviour);
+
+ /**
* @brief Creates an empty handle.
* @SINCE_1_0.0
*/
static TextLabel New(const std::string& text);
/**
- * @brief Creates the TextLabel control with additional behavior.
+ * @brief Creates the TextLabel control with additional behaviour.
*
* @SINCE_2_1.8
* @param[in] additionalBehaviour Additional control behaviour
static TextLabel New(ControlBehaviour additionalBehaviour);
/**
- * @brief Creates the TextLabel control with additional behavior.
+ * @brief Creates the TextLabel control with additional behaviour.
*
* @SINCE_2_1.8
* @param[in] additionalBehaviour Additional control behaviour