projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi Version 1.2.39" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
5005d8e
..
7301e70
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-26,6
+26,7
@@
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/hidden-text.h>
#include <dali-toolkit/internal/text/text-model-interface.h>
namespace Dali
#include <dali-toolkit/internal/text/text-model-interface.h>
namespace Dali
@@
-56,7
+57,7
@@
typedef IntrusivePtr<Controller> ControllerPtr;
*
* The text selection popup button callbacks are as well handled via the TextSelectionPopupCallbackInterface interface.
*/
*
* The text selection popup button callbacks are as well handled via the TextSelectionPopupCallbackInterface interface.
*/
-class Controller : public RefObject, public Decorator::ControllerInterface, public TextSelectionPopupCallbackInterface
+class Controller : public RefObject, public Decorator::ControllerInterface, public TextSelectionPopupCallbackInterface
, public HiddenText::Observer
{
public: // Enumerated types.
{
public: // Enumerated types.
@@
-120,6
+121,15
@@
public: // Enumerated types.
PLACEHOLDER_TYPE_INACTIVE,
};
PLACEHOLDER_TYPE_INACTIVE,
};
+ /**
+ * @brief Enumeration for Font Size Type.
+ */
+ enum FontSizeType
+ {
+ POINT_SIZE, // The size of font in points.
+ PIXEL_SIZE // The size of font in pixels.
+ };
+
struct NoTextTap
{
enum Action
struct NoTextTap
{
enum Action
@@
-347,7
+357,7
@@
public: // Configure the text controller.
/**
* @brief Sets input type to password
*
/**
* @brief Sets input type to password
*
- * @note The string is displayed
continuous "*"
+ * @note The string is displayed
hidden character
*
* @param[in] passwordInput True if password input is enabled.
*/
*
* @param[in] passwordInput True if password input is enabled.
*/
@@
-501,18
+511,20
@@
public: // Default style & Input style
FontSlant GetDefaultFontSlant() const;
/**
FontSlant GetDefaultFontSlant() const;
/**
- * @brief Set the default
poi
nt size.
+ * @brief Set the default
fo
nt size.
*
*
- * @param[in] pointSize The default point size.
+ * @param[in] size The default font size.
+ * @param[in] type The font size type is point size or pixel size
*/
*/
- void SetDefault
PointSize( float pointSiz
e );
+ void SetDefault
FontSize( float fontSize, FontSizeType typ
e );
/**
* @brief Retrieve the default point size.
*
/**
* @brief Retrieve the default point size.
*
+ * @param[in] type The font size type
* @return The default point size.
*/
* @return The default point size.
*/
- float GetDefault
PointSize(
) const;
+ float GetDefault
FontSize( FontSizeType type
) const;
/**
* @brief Sets the text's default color.
/**
* @brief Sets the text's default color.
@@
-887,6
+899,16
@@
public: // Queries & retrieves.
*/
bool GetTextScrollInfo( float& scrollPosition, float& controlHeight, float& layoutHeight );
*/
bool GetTextScrollInfo( float& scrollPosition, float& controlHeight, float& layoutHeight );
+ /**
+ * @brief Used to set the hidden input option
+ */
+ void SetHiddenInputOption( const Property::Map& options );
+
+ /**
+ * @brief Used to get the hidden input option
+ */
+ void GetHiddenInputOption( Property::Map& options );
+
public: // Relayout.
/**
public: // Relayout.
/**
@@
-1002,6
+1024,13
@@
protected: // Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface.
*/
virtual void TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button );
*/
virtual void TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button );
+protected: // Inherit from HiddenText.
+
+ /**
+ * @brief Invoked from HiddenText when showing time of the last character was expired
+ */
+ virtual void DisplayTimeExpired();
+
private: // Update.
/**
private: // Update.
/**