From d2e10b4ed531bff657f0a137724ce2fcbdf00432 Mon Sep 17 00:00:00 2001 From: Anton Obzhirov Date: Thu, 7 Jun 2018 15:31:11 +0100 Subject: [PATCH] Add Layout property ranges in devel Dali Toolkit properties ranges. Change-Id: Ic01adb37b87f27058ba2362944fe98b48f1f1d58 --- dali-toolkit/devel-api/file.list | 3 +- dali-toolkit/devel-api/layouting/hbox-layout.h | 4 +- dali-toolkit/devel-api/layouting/layout-group.h | 9 +--- dali-toolkit/devel-api/layouting/vbox-layout.h | 4 +- .../devel-api/toolkit-property-index-ranges.h | 49 ++++++++++++++++++++++ 5 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 dali-toolkit/devel-api/toolkit-property-index-ranges.h diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 674bcd1..86d2fc0 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -52,7 +52,8 @@ devel_api_src_files = \ # Add devel header files here devel_api_header_files = \ - $(devel_api_src_dir)/direction-enums.h + $(devel_api_src_dir)/direction-enums.h \ + $(devel_api_src_dir)/toolkit-property-index-ranges.h devel_api_controls_header_files = \ $(devel_api_src_dir)/controls/control-depth-index-ranges.h \ diff --git a/dali-toolkit/devel-api/layouting/hbox-layout.h b/dali-toolkit/devel-api/layouting/hbox-layout.h index 62c4bf7..7634b37 100644 --- a/dali-toolkit/devel-api/layouting/hbox-layout.h +++ b/dali-toolkit/devel-api/layouting/hbox-layout.h @@ -43,8 +43,8 @@ public: enum PropertyRange { - CHILD_PROPERTY_START_INDEX = LayoutGroup::CHILD_PROPERTY_START_INDEX+100, - CHILD_PROPERTY_END_INDEX = CHILD_PROPERTY_START_INDEX+1000 + CHILD_PROPERTY_START_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_START_INDEX, + CHILD_PROPERTY_END_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_END_INDEX }; struct Property diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h index d006775..c6b777b 100644 --- a/dali-toolkit/devel-api/layouting/layout-group.h +++ b/dali-toolkit/devel-api/layouting/layout-group.h @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -54,17 +55,11 @@ public: using LayoutId = unsigned int; static const unsigned int UNKNOWN_ID = 0; - enum PropertyRange - { - CHILD_PROPERTY_START_INDEX = CHILD_PROPERTY_REGISTRATION_START_INDEX+100, - CHILD_PROPERTY_END_INDEX = CHILD_PROPERTY_START_INDEX+1000 - }; - struct ChildProperty { enum { - MARGIN_SPECIFICATION = CHILD_PROPERTY_START_INDEX, + MARGIN_SPECIFICATION = LAYOUT_GROUP_CHILD_PROPERTY_START_INDEX, }; }; diff --git a/dali-toolkit/devel-api/layouting/vbox-layout.h b/dali-toolkit/devel-api/layouting/vbox-layout.h index 78e5bc2..f04a4bd 100644 --- a/dali-toolkit/devel-api/layouting/vbox-layout.h +++ b/dali-toolkit/devel-api/layouting/vbox-layout.h @@ -42,8 +42,8 @@ public: enum PropertyRange { - CHILD_PROPERTY_START_INDEX = LayoutGroup::CHILD_PROPERTY_START_INDEX+100, - CHILD_PROPERTY_END_INDEX = CHILD_PROPERTY_START_INDEX+1000 + CHILD_PROPERTY_START_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_START_INDEX, + CHILD_PROPERTY_END_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_END_INDEX }; struct ChildProperty diff --git a/dali-toolkit/devel-api/toolkit-property-index-ranges.h b/dali-toolkit/devel-api/toolkit-property-index-ranges.h new file mode 100644 index 0000000..c5db50c --- /dev/null +++ b/dali-toolkit/devel-api/toolkit-property-index-ranges.h @@ -0,0 +1,49 @@ +#ifndef DALI_DEVEL_TOOLKIT_PROPERTY_INDEX_RANGES_H +#define DALI_DEVEL_TOOLKIT_PROPERTY_INDEX_RANGES_H + +/* + * Copyright (c) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// EXTERNAL INCLUDES +#include + +namespace Dali +{ + +namespace Toolkit +{ + +/** + * @brief Enumeration for the start and end property ranges. + */ +enum DevelPropertyRanges +{ + LAYOUT_GROUP_CHILD_PROPERTY_START_INDEX = CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000, ///< Layout Group Property Start Index. + LAYOUT_GROUP_CHILD_PROPERTY_END_INDEX = LAYOUT_GROUP_CHILD_PROPERTY_START_INDEX + 999, ///< Layout Group Property End Index. + LINEAR_LAYOUT_CHILD_PROPERTY_START_INDEX = LAYOUT_GROUP_CHILD_PROPERTY_END_INDEX + 1, ///< Linear Layout Property Start Index. + LINEAR_LAYOUT_CHILD_PROPERTY_END_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_START_INDEX + 999, ///< Linear Layout Property End Index. + GRID_LAYOUT_CHILD_PROPERTY_START_INDEX = LINEAR_LAYOUT_CHILD_PROPERTY_END_INDEX + 1, ///< Grid Layout Property Start Index. + GRID_LAYOUT_CHILD_PROPERTY_END_INDEX = GRID_LAYOUT_CHILD_PROPERTY_START_INDEX + 999, ///< Grid Layout Property End Index. + FLEX_LAYOUT_CHILD_PROPERTY_START_INDEX = GRID_LAYOUT_CHILD_PROPERTY_END_INDEX + 1, ///< Flex Layout Property Start Index. + FLEX_LAYOUT_CHILD_PROPERTY_END_INDEX = FLEX_LAYOUT_CHILD_PROPERTY_START_INDEX + 999, ///< Flex Layout Property End Index. +}; + +} // namespace Toolkit + +} // namespace Dali + +#endif // DALI_DEVEL_TOOLKIT_PROPERTY_INDEX_RANGES_H -- 2.7.4