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 text selection popup style" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
common-text-utils.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
b/dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
index
e0c2306
..
c1f4179
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/common-text-utils.cpp
@@
-55,6
+55,7
@@
void CommonTextUtils::RenderText(
float& alignmentOffset,
Actor& renderableActor,
Actor& backgroundActor,
float& alignmentOffset,
Actor& renderableActor,
Actor& backgroundActor,
+ Actor& cursorLayerActor,
Toolkit::Control& stencil,
std::vector<Actor>& clippingDecorationActors,
std::vector<Toolkit::TextAnchor>& anchorActors,
Toolkit::Control& stencil,
std::vector<Actor>& clippingDecorationActors,
std::vector<Toolkit::TextAnchor>& anchorActors,
@@
-132,10
+133,6
@@
void CommonTextUtils::RenderText(
{
highlightActor = *it;
}
{
highlightActor = *it;
}
- else if(it->GetProperty<std::string>(Dali::Actor::Property::NAME) == "CursorLayerActor")
- {
- it->RaiseToTop();
- }
}
clippingDecorationActors.clear();
}
clippingDecorationActors.clear();
@@
-156,6
+153,12
@@
void CommonTextUtils::RenderText(
backgroundActor.LowerToBottom();
}
}
backgroundActor.LowerToBottom();
}
}
+
+ if(cursorLayerActor)
+ {
+ cursorLayerActor.RaiseToTop();
+ }
+
SynchronizeTextAnchorsInParent(textActor, controller, anchorActors);
}
}
SynchronizeTextAnchorsInParent(textActor, controller, anchorActors);
}
}