Add scroll-bar and scroll-component header files.

diff --git a/base/dali-toolkit/public-api/file.list b/base/dali-toolkit/public-api/file.list
index 396557f..dbca37b 100755 (executable)
--- a/base/dali-toolkit/public-api/file.list
+++ b/base/dali-toolkit/public-api/file.list
@@ -74,11 +74,7 @@ public_api_base_item_view_header_files = \
 public_api_base_popup_header_files =
 
 public_api_base_scrollable_header_files = \
 public_api_base_popup_header_files =
 
 public_api_base_scrollable_header_files = \

-  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h \
-  $(public_api_base_src_dir)/controls/scrollable/scroll-component.h
-
-public_api_base_scroll_bar_header_files = \
-  $(public_api_base_src_dir)/controls/scroll-bar/scroll-bar.h
+  $(public_api_base_src_dir)/controls/scrollable/scroll-component-impl.h

 
 public_api_base_scroll_view_header_files = \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \
 
 public_api_base_scroll_view_header_files = \
   $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.h \

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/slp/dali-toolkit/Makefile.am
index 1805f7e..c460e57 100644 (file)
--- a/build/slp/dali-toolkit/Makefile.am
+++ b/build/slp/dali-toolkit/Makefile.am
@@ -183,6 +183,7 @@ capidevelmagnifierdir = $(capideveldir)/controls/magnifier
 capidevelpopupdir = $(capideveldir)/controls/popup
 capidevelpageturnviewdir = $(capideveldir)/controls/page-turn-view
 capidevelscrollcomponentdir = $(capideveldir)/controls/scroll-component
 capidevelpopupdir = $(capideveldir)/controls/popup
 capidevelpageturnviewdir = $(capideveldir)/controls/page-turn-view
 capidevelscrollcomponentdir = $(capideveldir)/controls/scroll-component

+capidevelscrollbardir = $(capideveldir)/controls/scroll-bar

 capidevelscrollabledir = $(capideveldir)/controls/scrollable
 capidevelscrollviewdir = $(capideveldir)/controls/scrollable/scroll-view
 capidevelsliderdir = $(capideveldir)/controls/slider
 capidevelscrollabledir = $(capideveldir)/controls/scrollable
 capidevelscrollviewdir = $(capideveldir)/controls/scrollable/scroll-view
 capidevelsliderdir = $(capideveldir)/controls/slider


@@ -222,6 +223,7 @@ capidevelpopup_HEADERS = $(capi_devel_popup_header_files)
 capidevelpageturnview_HEADERS = $(capi_devel_page_turn_view_header_files)
 capidevelscrollcomponent_HEADERS = $(capi_devel_scroll_component_header_files)
 capidevelscrollable_HEADERS = $(capi_devel_scrollable_header_files)
 capidevelpageturnview_HEADERS = $(capi_devel_page_turn_view_header_files)
 capidevelscrollcomponent_HEADERS = $(capi_devel_scroll_component_header_files)
 capidevelscrollable_HEADERS = $(capi_devel_scrollable_header_files)

+capidevelscrollbar_HEADERS = $(capi_devel_scroll_bar_header_files)

 capidevelscrollview_HEADERS = $(capi_devel_scroll_view_header_files)
 capidevelslider_HEADERS = $(capi_devel_slider_header_files)
 capideveltableview_HEADERS = $(capi_devel_table_view_header_files)
 capidevelscrollview_HEADERS = $(capi_devel_scroll_view_header_files)
 capidevelslider_HEADERS = $(capi_devel_slider_header_files)
 capideveltableview_HEADERS = $(capi_devel_table_view_header_files)

diff --git a/base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
similarity index 100%
rename from base/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
rename to capi/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h

diff --git a/base/dali-toolkit/public-api/controls/scrollable/scroll-component.h b/capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h
similarity index 100%
rename from base/dali-toolkit/public-api/controls/scrollable/scroll-component.h
rename to capi/dali-toolkit/public-api/controls/scrollable/scroll-component.h

diff --git a/capi/dali-toolkit/public-api/file.list b/capi/dali-toolkit/public-api/file.list
index af712f4..caf2cb3 100644 (file)
--- a/capi/dali-toolkit/public-api/file.list
+++ b/capi/dali-toolkit/public-api/file.list
@@ -33,7 +33,11 @@ capi_devel_scroll_component_header_files =
 
 capi_devel_scrollable_header_files = \
   $(capi_devel_src_dir)/controls/scrollable/scrollable.h \
 
 capi_devel_scrollable_header_files = \
   $(capi_devel_src_dir)/controls/scrollable/scrollable.h \

-  $(capi_devel_src_dir)/controls/scrollable/scroll-connector.h
+  $(capi_devel_src_dir)/controls/scrollable/scroll-connector.h \
+  $(capi_devel_src_dir)/controls/scrollable/scroll-component.h
+
+capi_devel_scroll_bar_header_files = \
+  $(capi_devel_src_dir)/controls/scroll-bar/scroll-bar.h

 
 capi_devel_item_view_header_files = \
   $(capi_devel_src_dir)/controls/scrollable/item-view/grid-layout.h \
 
 capi_devel_item_view_header_files = \
   $(capi_devel_src_dir)/controls/scrollable/item-view/grid-layout.h \