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 "Add some APIs into web context." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
tooltip
/
tooltip-properties.h
diff --git
a/dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h
b/dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h
index
d473cec
..
3c4a901
100644
(file)
--- a/
dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h
+++ b/
dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_TOOLTIP_PROPERTIES_H
/*
#define DALI_TOOLKIT_TOOLTIP_PROPERTIES_H
/*
- * Copyright (c) 20
16
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.
@@
-23,19
+23,15
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Tooltip
{
namespace Tooltip
{
-
/**
* @brief The properties used for a Tooltip.
*/
namespace Property
{
/**
* @brief The properties used for a Tooltip.
*/
namespace Property
{
-
enum
{
/**
enum
{
/**
@@
-134,10
+130,8
@@
enum
namespace Background
{
namespace Background
{
-
namespace Property
{
namespace Property
{
-
enum
{
/**
enum
{
/**
@@
-166,13
+160,11
@@
enum
*/
namespace Tail
{
*/
namespace Tail
{
-
/**
* @brief The properties of the tail used by the tooltip.
*/
namespace Property
{
/**
* @brief The properties of the tail used by the tooltip.
*/
namespace Property
{
-
enum
{
/**
enum
{
/**
@@
-202,14
+194,13
@@
enum
namespace Position
{
namespace Position
{
-
/**
* @brief The position of the tooltip in relation to the control.
*/
enum Type
{
/**
* @brief The position of the tooltip in relation to the control.
*/
enum Type
{
- ABOVE, ///< The tooltip will appear above the control.
- BELOW, ///< The tooltip will appear below the control.
+ ABOVE,
///< The tooltip will appear above the control.
+ BELOW,
///< The tooltip will appear below the control.
HOVER_POINT ///< The tooltip will appear near the hover point.
};
HOVER_POINT ///< The tooltip will appear near the hover point.
};