summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-07-10 11:17:29 +0900
committerHermet Park <hermetpark@gmail.com>2018-07-10 11:17:29 +0900
commit0bc002cf4a0b789f11153fc26c3eb2720465f356 (patch)
treec6667615645f2269785f4b06b512996436267282
parent78cd61034185f07779d70163a38f5ffdffe5507b (diff)
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 43829ae7b2..250cb05d14 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -340,10 +340,10 @@ typedef Eo Efl_Ui_Focus_Manager;
340# include <efl_ui_view_list_relayout.eo.h> 340# include <efl_ui_view_list_relayout.eo.h>
341# include <efl_ui_view_list.eo.h> 341# include <efl_ui_view_list.eo.h>
342# include <efl_ui_view_list_pan.eo.h> 342# include <efl_ui_view_list_pan.eo.h>
343# include <efl_ui_pan.eo.h>
343# include <efl_ui_scroll_manager.eo.h> 344# include <efl_ui_scroll_manager.eo.h>
344# include <efl_ui_scroller.eo.h> 345# include <efl_ui_scroller.eo.h>
345# include <efl_ui_dnd_types.eot.h> 346# include <efl_ui_dnd_types.eot.h>
346# include <efl_ui_pan.eo.h>
347# include <efl_selection.eo.h> 347# include <efl_selection.eo.h>
348# include <efl_ui_dnd.eo.h> 348# include <efl_ui_dnd.eo.h>
349# include <efl_ui_dnd_container.eo.h> 349# 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,
17 set { 17 set {
18 } 18 }
19 values { 19 values {
20 pan: Efl.Canvas.Object @nullable; [[Pan object]] 20 pan: Efl.Ui.Pan @nullable; [[Pan object]]
21 } 21 }
22 } 22 }
23 } 23 }