From 0bc002cf4a0b789f11153fc26c3eb2720465f356 Mon Sep 17 00:00:00 2001 From: Daniel Hirt Date: Tue, 10 Jul 2018 11:17:29 +0900 Subject: [PATCH] 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 --- src/lib/elementary/Elementary.h | 2 +- src/lib/elementary/efl_ui_scroll_manager.eo | 2 +- 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; # include # include # include +# include # include # include # include -# include # include # include # include 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]] } } }