From ea014e3440f8df4426bd32d76f07150bd0810d30 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Mon, 14 Dec 2020 14:53:32 -0300 Subject: [PATCH] Make -DUSE_DEFAULT_RESOURCE_DIR=OFF compile again DALI_IMAGE_DIR isn't defined as a path when USE_DEFAULT_RESOURCE_DIR=OFF. Use the AssetManager class to get the image path. Change-Id: I75099c046a248d643419779747a4235e52f510c4 --- dali-toolkit/internal/controls/control/control-data-impl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 4e7dff9..83cc802 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -47,6 +47,7 @@ #include #include #include +#include namespace { @@ -2108,14 +2109,13 @@ bool Control::Impl::AccessibleImpl::GrabFocus() return Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor( self ); } -const char* const FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "keyboard_focus.9.png"; - static Dali::Actor CreateHighlightIndicatorActor() { + std::string focusBorderImagePath(AssetManager::GetDaliImagePath()); + focusBorderImagePath += "/keyboard_focus.9.png"; // Create the default if it hasn't been set and one that's shared by all the - // keyboard focusable actors const char* const FOCUS_BORDER_IMAGE_PATH = - // DALI_IMAGE_DIR "keyboard_focus.9.png"; - auto actor = Toolkit::ImageView::New( FOCUS_BORDER_IMAGE_PATH ); + // keyboard focusable actors + auto actor = Toolkit::ImageView::New( focusBorderImagePath ); actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); DevelControl::AppendAccessibilityAttribute( actor, "highlight", "" ); actor.SetProperty( Toolkit::DevelControl::Property::ACCESSIBILITY_ANIMATED, true); -- 2.7.4