#include <dali/public-api/size-negotiation/relayout-container.h>
#include <sstream>
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
using namespace Dali;
// currently not called from code so compiler will optimize these away, kept here for future debugging
#define FLEX_CONTAINER_TAG "DALI Toolkit::FlexContainer "
-#define FC_LOG(fmt, args, ...) Debug::LogMessage(Debug::DebugInfo, FLEX_CONTAINER_TAG fmt, ##args)
+#define FC_LOG(fmt, args, ...) Debug::LogMessageWithFunctionLine(Debug::DebugInfo, FLEX_CONTAINER_TAG fmt, ##args)
// #define FLEX_CONTAINER_DEBUG 1
#if defined(FLEX_CONTAINER_DEBUG)
{"center", Toolkit::FlexContainer::JUSTIFY_CENTER},
{"flexEnd", Toolkit::FlexContainer::JUSTIFY_FLEX_END},
{"spaceBetween", Toolkit::FlexContainer::JUSTIFY_SPACE_BETWEEN},
- {"spaceAround", Toolkit::FlexContainer::JUSTIFY_SPACE_AROUND}};
+ {"spaceAround", Toolkit::FlexContainer::JUSTIFY_SPACE_AROUND},
+ {"spaceEvenly", Toolkit::FlexContainer::JUSTIFY_SPACE_EVENLY}};
const unsigned int JUSTIFY_CONTENT_STRING_TABLE_COUNT = sizeof(JUSTIFY_CONTENT_STRING_TABLE) / sizeof(JUSTIFY_CONTENT_STRING_TABLE[0]);
const Scripting::StringEnum ALIGN_ITEMS_STRING_TABLE[] =
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
return std::unique_ptr<Dali::Accessibility::Accessible>(
- new Control::Impl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
+ new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::FILLER));
});
}