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
Allow text-selection scroll indicator to have a different style
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
bubble-effect
/
color-adjuster.h
diff --git
a/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
b/dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
index
008f814
..
27df32e
100644
(file)
--- a/
dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
+++ b/
dali-toolkit/internal/controls/bubble-effect/color-adjuster.h
@@
-23,7
+23,7
@@
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/property-map.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visual
-factory/devel-visual-properties
.h>
+#include <dali-toolkit/devel-api/visual
s/visual-properties-devel
.h>
#define DALI_COMPOSE_SHADER(STR) #STR
#define DALI_COMPOSE_SHADER(STR) #STR
@@
-97,7
+97,7
@@
inline Property::Map CreateColorAdjuster()
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentShader;
Property::Map map;
customShader[ Toolkit::Visual::Shader::Property::FRAGMENT_SHADER ] = fragmentShader;
Property::Map map;
- map[ Toolkit::
Visual
Property::SHADER ] = customShader;
+ map[ Toolkit::
DevelVisual::
Property::SHADER ] = customShader;
return map;
}
return map;
}