summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-07-10 11:17:29 +0900
committerSangHyeon Jade Lee <sh10233.lee@samsung.com>2018-07-12 11:34:47 +0900
commitb085ce95b0e072bbc4555b0544c876d892abba5f (patch)
treead2213c0714d0bb54eae95c7b8e295615d02de45
parenta9a987077be7e64f93a2a824f9b936d593b4ff2f (diff)
downloadefl-b085ce95b0e072bbc4555b0544c876d892abba5f.tar.gz
Ui.Scroll_Manager: restrict to Efl.Ui.Pan type for 'pan' property
Summary: The implementation calls efl_ui_pan_xxx on what was assumed to be any Efl.Canvas.Object. This changes the type to be Efl.Ui.Pan. Also, reordered headers due to the introduced dependency. Reviewers: devilhorns, Hermet Reviewed By: Hermet Subscribers: cedric, #committers, zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6536
-rw-r--r--src/lib/elementary/Elementary.h2
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.eo2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 734467c72d..f5de50b13e 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -345,10 +345,10 @@ typedef Eo Efl_Ui_Focus_Manager;
# include <efl_ui_view_list_relayout.eo.h>
# include <efl_ui_view_list.eo.h>
# include <efl_ui_view_list_pan.eo.h>
+# include <efl_ui_pan.eo.h>
# include <efl_ui_scroll_manager.eo.h>
# include <efl_ui_scroller.eo.h>
# include <efl_ui_dnd_types.eot.h>
-# include <efl_ui_pan.eo.h>
# include <efl_selection.eo.h>
# include <efl_ui_dnd.eo.h>
# include <efl_ui_dnd_container.eo.h>
diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo
index c61656263b..07c0d34c4b 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.eo
+++ b/src/lib/elementary/efl_ui_scroll_manager.eo
@@ -17,7 +17,7 @@ class Efl.Ui.Scroll.Manager (Efl.Object,
set {
}
values {
- pan: Efl.Canvas.Object @nullable; [[Pan object]]
+ pan: Efl.Ui.Pan @nullable; [[Pan object]]
}
}
}