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 2.1.23" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
text-controls
/
text-selection-popup.h
diff --git
a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
index
31cf939
..
4080c90
100644
(file)
--- a/
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
+++ b/
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
-#define
__DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
+#ifndef
DALI_TOOLKIT_TEXT_SELECTION_POPUP_H
+#define
DALI_TOOLKIT_TEXT_SELECTION_POPUP_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-23,10
+23,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
class TextSelectionPopupCallbackInterface;
namespace Internal DALI_INTERNAL
class TextSelectionPopupCallbackInterface;
namespace Internal DALI_INTERNAL
@@
-44,19
+42,18
@@
class TextSelectionPopup;
*
*
*/
*
*
*/
-class DALI_
IMPOR
T_API TextSelectionPopup : public Control
+class DALI_
TOOLKI
T_API TextSelectionPopup : public Control
{
public:
{
public:
-
enum Buttons
{
enum Buttons
{
- CUT = 1u << 0,
- COPY = 1u << 1,
- PASTE = 1u << 2,
- SELECT = 1u << 3,
+ CUT
= 1u << 0,
+ COPY
= 1u << 1,
+ PASTE
= 1u << 2,
+ SELECT
= 1u << 3,
SELECT_ALL = 1u << 4,
SELECT_ALL = 1u << 4,
- CLIPBOARD = 1u << 5,
- NONE = 1u << 6,
+ CLIPBOARD
= 1u << 5,
+ NONE
= 1u << 6,
};
/**
};
/**
@@
-65,7
+62,7
@@
public:
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserve property indices
+ PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserve property indices
};
/**
};
/**
@@
-79,7
+76,7
@@
public:
* @brief The maximum size the Popup can be.
* @details Name "popupMaxSize", type Vector2.
*/
* @brief The maximum size the Popup can be.
* @details Name "popupMaxSize", type Vector2.
*/
- POPUP_MAX_SIZE =
PROPERTY_START_INDEX,
+ POPUP_MAX_SIZE = PROPERTY_START_INDEX,
/**
* @brief The minimum size the Popup can be.
/**
* @brief The minimum size the Popup can be.
@@
-106,6
+103,12
@@
public:
OPTION_DIVIDER_SIZE,
/**
OPTION_DIVIDER_SIZE,
/**
+ * @brief The padding of the divider between options.
+ * @details Name "optionDividerPadding", type Vector4.
+ */
+ OPTION_DIVIDER_PADDING,
+
+ /**
* @brief The image to use as the popup clipboard icon.
* @details Name "popupClipboardButtonImage", type string.
*/
* @brief The image to use as the popup clipboard icon.
* @details Name "popupClipboardButtonImage", type string.
*/
@@
-191,7
+194,7
@@
public:
* @param[in] callbackInterface The text popup callback interface which receives the button click callbacks.
* @return A handle to the TextSelectionPopup control.
*/
* @param[in] callbackInterface The text popup callback interface which receives the button click callbacks.
* @return A handle to the TextSelectionPopup control.
*/
- static TextSelectionPopup New(
TextSelectionPopupCallbackInterface* callbackInterface
);
+ static TextSelectionPopup New(
TextSelectionPopupCallbackInterface* callbackInterface
);
/**
* @brief Creates an empty handle.
/**
* @brief Creates an empty handle.
@@
-203,7
+206,7
@@
public:
*
* @param[in] handle The handle to copy from.
*/
*
* @param[in] handle The handle to copy from.
*/
- TextSelectionPopup(
const TextSelectionPopup& handle
);
+ TextSelectionPopup(
const TextSelectionPopup& handle
);
/**
* @brief Assignment operator.
/**
* @brief Assignment operator.
@@
-211,7
+214,7
@@
public:
* @param[in] handle The handle to copy from.
* @return A reference to this.
*/
* @param[in] handle The handle to copy from.
* @return A reference to this.
*/
- TextSelectionPopup& operator=(
const TextSelectionPopup& handle
);
+ TextSelectionPopup& operator=(
const TextSelectionPopup& handle
);
/**
* @brief Destructor
/**
* @brief Destructor
@@
-229,20
+232,20
@@
public:
* @param[in] handle Handle to an object
* @return handle to a TextSelectionPopup or an empty handle
*/
* @param[in] handle Handle to an object
* @return handle to a TextSelectionPopup or an empty handle
*/
- static TextSelectionPopup DownCast(
BaseHandle handle
);
+ static TextSelectionPopup DownCast(
BaseHandle handle
);
/**
* @brief Specify which buttons to show in Popup
* @param[in] buttonsToEnable Buttons to enable
*/
/**
* @brief Specify which buttons to show in Popup
* @param[in] buttonsToEnable Buttons to enable
*/
- void EnableButtons(
Toolkit::TextSelectionPopup::Buttons buttonsToEnable
);
+ void EnableButtons(
Toolkit::TextSelectionPopup::Buttons buttonsToEnable
);
/**
/**
- * @brief Raises the toolbar's
layer above the given @e target laye
r.
+ * @brief Raises the toolbar's
actor above the given @e target acto
r.
*
*
- * @param[in] target The
laye
r to get above of.
+ * @param[in] target The
acto
r to get above of.
*/
*/
- void RaiseAbove(
Layer target
);
+ void RaiseAbove(
Actor target
);
/**
* @brief Show the Popup if not being shown
/**
* @brief Show the Popup if not being shown
@@
-255,20
+258,19
@@
public:
void HidePopup();
public: // Not intended for application developers
void HidePopup();
public: // Not intended for application developers
-
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
* @param[in] implementation The Control implementation.
*/
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
*
* @param[in] implementation The Control implementation.
*/
- DALI_INTERNAL TextSelectionPopup(
Internal::TextSelectionPopup& implementation
);
+ DALI_INTERNAL TextSelectionPopup(
Internal::TextSelectionPopup& implementation
);
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
*
* @param[in] internal A pointer to the internal CustomActor.
*/
- explicit DALI_INTERNAL TextSelectionPopup(
Dali::Internal::CustomActor* internal
);
+ explicit DALI_INTERNAL TextSelectionPopup(
Dali::Internal::CustomActor* internal
);
}; // Class TextSelectionPopup
}; // Class TextSelectionPopup
@@
-276,4
+278,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__
+#endif //
DALI_TOOLKIT_TEXT_SELECTION_POPUP_H