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
Split text-controller files in text-controller and text-controller-impl.
[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
076897a
..
d37efab
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-243,14
+243,14
@@
public:
bool IsUnderlineEnabled() const;
/**
bool IsUnderlineEnabled() const;
/**
- * @brief Set the override used for underline height, 0 indicates height will be supplied by
adaptor
+ * @brief Set the override used for underline height, 0 indicates height will be supplied by
font metrics
*
* @param[in] height The height in pixels of the underline
*/
void SetUnderlineHeight( float height );
/**
*
* @param[in] height The height in pixels of the underline
*/
void SetUnderlineHeight( float height );
/**
- * @brief Retrieves the override height of an underline, 0 indicates height is supplied by
adaptor
+ * @brief Retrieves the override height of an underline, 0 indicates height is supplied by
font metrics
*
* @return The height of the underline, or 0 if height is not overrided.
*/
*
* @return The height of the underline, or 0 if height is not overrided.
*/
@@
-427,11
+427,6
@@
protected:
private:
/**
private:
/**
- * @brief Request a relayout using the ControlInterface.
- */
- void RequestRelayout();
-
- /**
* @brief Private constructor.
*/
Controller( ControlInterface& controlInterface );
* @brief Private constructor.
*/
Controller( ControlInterface& controlInterface );
@@
-446,12
+441,6
@@
private:
struct Impl;
Impl* mImpl;
struct Impl;
Impl* mImpl;
-
- // Avoid allocating this when the user does not specify a font
- struct FontDefaults;
-
- // Avoid allocating this for non-editable controls
- struct TextInput;
};
} // namespace Text
};
} // namespace Text