X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Fsuper-blur-view%2Fsuper-blur-view-impl.cpp;h=7ea1492e2f705f5538ac9e1d09282930e2e0b4a2;hb=HEAD;hp=6325e62940888537f6011751be28133dbeb382f5;hpb=33cc4f793171389fb2bdc87d0e1915eb25a35f3d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 6325e62..4aedfc0 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -147,12 +147,9 @@ void SuperBlurView::OnInitialize() { Actor self(Self()); - mBlurStrengthPropertyIndex = self.RegisterProperty("blurStrength", 0.f); + mBlurStrengthPropertyIndex = self.RegisterUniqueProperty("blurStrength", 0.f); - DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) { - return std::unique_ptr( - new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER)); - }); + self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::FILLER); } void SuperBlurView::SetTexture(Texture texture) @@ -195,7 +192,7 @@ void SuperBlurView::SetBlurStrength(float blurStrength) float SuperBlurView::GetCurrentBlurStrength() const { - float blurStrength; + float blurStrength = 0.0f; (Self().GetProperty(mBlurStrengthPropertyIndex)).Get(blurStrength); return blurStrength; @@ -307,7 +304,7 @@ void SuperBlurView::OnSceneConnection(int depth) if(i > 0) { Renderer renderer = mRenderers[i]; - Property::Index index = renderer.RegisterProperty(ALPHA_UNIFORM_NAME, 0.f); + Property::Index index = renderer.RegisterUniqueProperty(ALPHA_UNIFORM_NAME, 0.f); Constraint constraint = Constraint::New(renderer, index, ActorOpacityConstraint(mBlurLevels, i - 1)); constraint.AddSource(Source(self, mBlurStrengthPropertyIndex)); constraint.Apply(); @@ -356,20 +353,21 @@ void SuperBlurView::SetProperty(BaseObject* object, Property::Index propertyInde if(propertyIndex == Toolkit::SuperBlurView::Property::IMAGE_URL) { - value.Get(superBlurViewImpl.mUrl); - - PixelData pixels = SyncImageLoader::Load(superBlurViewImpl.mUrl); - - if(pixels) - { - Texture texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight()); - texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight()); - - superBlurViewImpl.SetTexture(texture); - } - else + if(DALI_LIKELY(value.Get(superBlurViewImpl.mUrl))) { - DALI_LOG_ERROR("Cannot create image from property value\n"); + PixelData pixels = SyncImageLoader::Load(superBlurViewImpl.mUrl); + + if(pixels) + { + Texture texture = Texture::New(TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight()); + texture.Upload(pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight()); + + superBlurViewImpl.SetTexture(texture); + } + else + { + DALI_LOG_ERROR("Cannot create image from property value\n"); + } } } }