From: Kimmo Hoikka Date: Wed, 10 Jun 2015 16:39:11 +0000 (-0700) Subject: Merge "Dont register accessibility and keyboard focus properties as scene graph prope... X-Git-Tag: dali_1.0.44~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=64cacc4d250a25eb19c27ed55741f3ae61266518;hp=2a9ea91b7a05e1cf6d50e08425a7607bebab099f Merge "Dont register accessibility and keyboard focus properties as scene graph properties" into devel/master --- diff --git a/dali-toolkit/internal/focus-manager/accessibility-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/accessibility-focus-manager-impl.cpp index 728bd42..0be65d3 100644 --- a/dali-toolkit/internal/focus-manager/accessibility-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/accessibility-focus-manager-impl.cpp @@ -190,7 +190,7 @@ void AccessibilityFocusManager::SetFocusOrder(Actor actor, const unsigned int or Property::Index propertyActorFocusable = actor.GetPropertyIndex(ACTOR_FOCUSABLE); if(propertyActorFocusable == Property::INVALID_INDEX) { - propertyActorFocusable = actor.RegisterProperty(ACTOR_FOCUSABLE, true); + propertyActorFocusable = actor.RegisterProperty( ACTOR_FOCUSABLE, true, Property::READ_WRITE ); } if(order == 0) @@ -511,7 +511,7 @@ void AccessibilityFocusManager::SetFocusGroup(Actor actor, bool isFocusGroup) Property::Index propertyIsFocusGroup = actor.GetPropertyIndex(IS_FOCUS_GROUP); if(propertyIsFocusGroup == Property::INVALID_INDEX) { - actor.RegisterProperty(IS_FOCUS_GROUP, isFocusGroup); + actor.RegisterProperty( IS_FOCUS_GROUP, isFocusGroup, Property::READ_WRITE ); } else { @@ -654,7 +654,7 @@ void AccessibilityFocusManager::SetFocusable(Actor actor, bool focusable) Property::Index propertyActorFocusable = actor.GetPropertyIndex(ACTOR_FOCUSABLE); if(propertyActorFocusable == Property::INVALID_INDEX) { - actor.RegisterProperty(ACTOR_FOCUSABLE, focusable); + actor.RegisterProperty( ACTOR_FOCUSABLE, focusable, Property::READ_WRITE ); } else { diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 19573e8..5be38ac 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@ -397,7 +397,7 @@ void KeyboardFocusManager::SetAsFocusGroup(Actor actor, bool isFocusGroup) Property::Index propertyIsFocusGroup = actor.GetPropertyIndex(IS_FOCUS_GROUP_PROPERTY_NAME); if(propertyIsFocusGroup == Property::INVALID_INDEX) { - actor.RegisterProperty(IS_FOCUS_GROUP_PROPERTY_NAME, isFocusGroup); + actor.RegisterProperty(IS_FOCUS_GROUP_PROPERTY_NAME, isFocusGroup, Property::READ_WRITE ); } else {