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
Dali-Text: Keyboard Shortcuts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
decorator
/
text-decorator.h
diff --git
a/dali-toolkit/internal/text/decorator/text-decorator.h
b/dali-toolkit/internal/text/decorator/text-decorator.h
index
11f7062
..
8d0894f
100644
(file)
--- a/
dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/
dali-toolkit/internal/text/decorator/text-decorator.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_DECORATOR_H__
-#define
__DALI_TOOLKIT_TEXT_DECORATOR_H__
+#ifndef
DALI_TOOLKIT_TEXT_DECORATOR_H
+#define
DALI_TOOLKIT_TEXT_DECORATOR_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-353,23
+353,23
@@
public:
bool IsHandleActive( HandleType handleType ) const;
/**
bool IsHandleActive( HandleType handleType ) const;
/**
- * @brief Sets the image for one of the handles.
+ * @brief Sets the image f
ile name f
or one of the handles.
*
* @param[in] handleType One of the handles.
* @param[in] handleImageType A different image can be set for the pressed/released states.
*
* @param[in] handleType One of the handles.
* @param[in] handleImageType A different image can be set for the pressed/released states.
- * @param[in] image
The imag
e to use.
+ * @param[in] image
FileName The image filenam
e to use.
*/
*/
- void SetHandleImage( HandleType handleType, HandleImageType handleImageType,
Dali::Image imag
e );
+ void SetHandleImage( HandleType handleType, HandleImageType handleImageType,
const std::string& imageFileNam
e );
/**
/**
- * @brief Retrieves the image for one of the handles.
+ * @brief Retrieves the
file name of the
image for one of the handles.
*
* @param[in] handleType One of the handles.
* @param[in] handleImageType A different image can be set for the pressed/released states.
*
*
* @param[in] handleType One of the handles.
* @param[in] handleImageType A different image can be set for the pressed/released states.
*
- * @return The grab handle image.
+ * @return The grab handle image
string
.
*/
*/
-
Dali::Image
GetHandleImage( HandleType handleType, HandleImageType handleImageType ) const;
+
const std::string&
GetHandleImage( HandleType handleType, HandleImageType handleImageType ) const;
/**
* @brief Sets the color of the handles
/**
* @brief Sets the color of the handles
@@
-515,6
+515,13
@@
public:
bool IsHighlightActive() const;
/**
bool IsHighlightActive() const;
/**
+ * @brief Retreives whether the highlight is shown or not.
+ *
+ * @return true if the highlight is visible, false otherwise.
+ */
+ bool IsHighlightVisible() const;
+
+ /**
* @brief Sets into the decorator the depth used to render the text.
*
* @param[in] depth The text's depth.
* @brief Sets into the decorator the depth used to render the text.
*
* @param[in] depth The text's depth.
@@
-648,4
+655,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_DECORATOR_H__
+#endif //
DALI_TOOLKIT_TEXT_DECORATOR_H