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
/
text-field-property-handler.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
b/dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
index
c4080b7
..
f1247f9
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
@@
-700,6
+700,15
@@
void TextField::PropertyHandler::SetProperty(Toolkit::TextField textField, Prope
impl.mController->SetCharacterSpacing(characterSpacing);
break;
}
impl.mController->SetCharacterSpacing(characterSpacing);
break;
}
+ case Toolkit::DevelTextField::Property::SELECTION_POPUP_STYLE:
+ {
+ const Property::Map* map = value.GetMap();
+ if(map)
+ {
+ impl.mDecorator->SetSelectionPopupStyle(*map);
+ }
+ break;
+ }
}
}
}
}
@@
-1080,6
+1089,13
@@
Property::Value TextField::PropertyHandler::GetProperty(Toolkit::TextField textF
value = impl.mController->GetCharacterSpacing();
break;
}
value = impl.mController->GetCharacterSpacing();
break;
}
+ case Toolkit::DevelTextField::Property::SELECTION_POPUP_STYLE:
+ {
+ Property::Map map;
+ impl.mDecorator->GetSelectionPopupStyle(map);
+ value = map;
+ break;
+ }
} //switch
return value;
}
} //switch
return value;
}