From 9bb666e4666c3872690612266bd43f37cdd6b5cf Mon Sep 17 00:00:00 2001 From: seungho baek Date: Wed, 20 Sep 2023 20:56:31 +0900 Subject: [PATCH] [Tizen] Fix to set synchronous loading property only for Image background Change-Id: Ie981890510fcac56d21c5badc9e60f5d481b8832 Signed-off-by: seungho baek --- dali-toolkit/internal/controls/control/control-data-impl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 27f0e59..3207941 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -957,7 +957,11 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons if( map && !map->Empty() ) { Property::Map newMap; - newMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true; + Property::Value* typeValue = map->Find(Toolkit::Visual::Property::TYPE); + if(typeValue && typeValue->Get() == Toolkit::Visual::IMAGE) + { + newMap[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true; + } newMap.Merge(*map); controlImpl.SetBackground( newMap ); } @@ -965,7 +969,8 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons { // don't know the size to load Property::Map map; - map[Toolkit::ImageVisual::Property::URL] = url; + map[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::IMAGE; + map[Toolkit::ImageVisual::Property::URL] = url; map[Toolkit::ImageVisual::Property::SYNCHRONOUS_LOADING] = true; controlImpl.SetBackground(map); } -- 2.7.4