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 "Fix svace issue on text controller" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-placeholder-handler.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
b/dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
index
301dbcb
..
312ecb5
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
+++ b/
dali-toolkit/internal/text/text-controller-placeholder-handler.cpp
@@
-61,7
+61,7
@@
void Controller::PlaceholderHandler::SetPlaceholderTextElideEnabled(Controller&
if(controller.mImpl->IsShowingPlaceholderText() ||
(0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
{
if(controller.mImpl->IsShowingPlaceholderText() ||
(0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
{
-
controller.ShowPlaceholderText(
);
+
ShowPlaceholderText(*controller.mImpl
);
}
}
}
}
@@
-87,7
+87,7
@@
void Controller::PlaceholderHandler::SetPlaceholderText(Controller& controller,
if(controller.mImpl->IsShowingPlaceholderText() ||
(0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
{
if(controller.mImpl->IsShowingPlaceholderText() ||
(0u == controller.mImpl->mModel->mLogicalModel->mText.Count()))
{
-
controller.ShowPlaceholderText(
);
+
ShowPlaceholderText(*controller.mImpl
);
}
}
}
}
}
}
@@
-322,6
+322,8
@@
void Controller::PlaceholderHandler::SetPlaceholderTextColor(Controller& control
if(controller.mImpl->IsShowingPlaceholderText())
{
controller.mImpl->mModel->mVisualModel->SetTextColor(textColor);
if(controller.mImpl->IsShowingPlaceholderText())
{
controller.mImpl->mModel->mVisualModel->SetTextColor(textColor);
+ controller.mImpl->mModel->mLogicalModel->mColorRuns.Clear();
+ controller.mImpl->mOperationsPending = static_cast<OperationsMask>(controller.mImpl->mOperationsPending | COLOR);
controller.mImpl->RequestRelayout();
}
}
controller.mImpl->RequestRelayout();
}
}
@@
-441,10
+443,8
@@
void Controller::PlaceholderHandler::GetPlaceholderProperty(Controller& controll
}
}
}
}
-void Controller::PlaceholderHandler::ShowPlaceholderText(Controller
& controller
)
+void Controller::PlaceholderHandler::ShowPlaceholderText(Controller
::Impl& impl
)
{
{
- Controller::Impl& impl = *controller.mImpl;
-
if(impl.IsPlaceholderAvailable())
{
EventData*& eventData = impl.mEventData;
if(impl.IsPlaceholderAvailable())
{
EventData*& eventData = impl.mEventData;