aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-09 15:38:19 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:59 -0700
commit0b6a0fdc9746b6a6151dd6185a42649153b6b3f5 (patch)
tree54a60b491d0896b95a7fd919bd347a42db28e767
parentEfl.Ui.Progressbar_Part (from Efl.Ui.Progressbar.Part) (diff)
downloadefl-0b6a0fdc9746b6a6151dd6185a42649153b6b3f5.tar.gz
Efl.Ui.Scrollable_Interactive (from Efl.Ui.Scrollable.Interactive)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo4
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.eo24
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo16
-rw-r--r--src/lib/elementary/efl_ui_view_list.eo10
5 files changed, 28 insertions, 28 deletions
diff --git a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
index d3139c8225..5595374775 100644
--- a/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
+++ b/src/lib/efl/interfaces/efl_ui_scrollable_interactive.eo
@@ -1,6 +1,6 @@
import eina_types;
-interface Efl.Ui.Scrollable.Interactive (Efl.Ui.Scrollable)
+interface Efl.Ui.Scrollable_Interactive (Efl.Ui.Scrollable)
{
eo_prefix: efl_ui_scrollable;
methods {
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 88aa8925aa..3c0fb24417 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
- Efl.Ui.Scrollable.Interactive,
+ Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar)
{
[[Elementary Image Zoomable class]]
@@ -61,7 +61,7 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
Efl.Ui.Widget.theme_apply;
Efl.Ui.Focus.Object.on_focus_update;
Efl.Ui.Widget.widget_event;
- Efl.Ui.Scrollable.Interactive.scroll;
+ Efl.Ui.Scrollable_Interactive.scroll;
Efl.Access.Widget.Action.elm_actions { get; }
Efl.File.file { get; set; }
Efl.Orientation.orientation { get; set; }
diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo
index f7a34dfb93..c61656263b 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.eo
+++ b/src/lib/elementary/efl_ui_scroll_manager.eo
@@ -1,6 +1,6 @@
class Efl.Ui.Scroll.Manager (Efl.Object,
Efl.Ui.Base,
- Efl.Ui.Scrollable.Interactive,
+ Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar)
{
[[Efl ui scroll manager class]]
@@ -25,20 +25,20 @@ class Efl.Ui.Scroll.Manager (Efl.Object,
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Ui.Base.mirrored { set; }
- Efl.Ui.Scrollable.Interactive.content_pos { set; get; }
- Efl.Ui.Scrollable.Interactive.content_size{ get; }
- Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; }
- Efl.Ui.Scrollable.Interactive.bounce_enabled { set; get; }
- Efl.Ui.Scrollable.Interactive.scroll_freeze { get; set; }
- Efl.Ui.Scrollable.Interactive.scroll_hold { get; set; }
- Efl.Ui.Scrollable.Interactive.looping { get; set; }
- Efl.Ui.Scrollable.Interactive.movement_block { get; set; }
- Efl.Ui.Scrollable.Interactive.gravity { get; set; }
- Efl.Ui.Scrollable.Interactive.match_content { set; }
+ Efl.Ui.Scrollable_Interactive.content_pos { set; get; }
+ Efl.Ui.Scrollable_Interactive.content_size{ get; }
+ Efl.Ui.Scrollable_Interactive.viewport_geometry{ get; }
+ Efl.Ui.Scrollable_Interactive.bounce_enabled { set; get; }
+ Efl.Ui.Scrollable_Interactive.scroll_freeze { get; set; }
+ Efl.Ui.Scrollable_Interactive.scroll_hold { get; set; }
+ Efl.Ui.Scrollable_Interactive.looping { get; set; }
+ Efl.Ui.Scrollable_Interactive.movement_block { get; set; }
+ Efl.Ui.Scrollable_Interactive.gravity { get; set; }
+ Efl.Ui.Scrollable_Interactive.match_content { set; }
Efl.Ui.Scrollbar.bar_mode { get; set; }
Efl.Ui.Scrollbar.bar_size { get; }
Efl.Ui.Scrollbar.bar_position { get; set; }
Efl.Ui.Scrollbar.bar_visibility_update;
- Efl.Ui.Scrollable.Interactive.scroll;
+ Efl.Ui.Scrollable_Interactive.scroll;
}
}
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index b0fff32564..65c4f8a5fd 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,5 +1,5 @@
class Efl.Ui.Scroller (Efl.Ui.Layout.Object,
- Efl.Ui.Scrollable.Interactive,
+ Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Content,
Efl.Ui.Drag)
@@ -11,13 +11,13 @@ class Efl.Ui.Scroller (Efl.Ui.Layout.Object,
Efl.Object.destructor;
Efl.Content.content { set; }
Efl.Ui.Widget.theme_apply;
- Efl.Ui.Scrollable.Interactive.content_size{ get; }
- Efl.Ui.Scrollable.Interactive.viewport_geometry{ get; }
- Efl.Ui.Scrollable.Interactive.bounce_enabled { set; get; }
- Efl.Ui.Scrollable.Interactive.scroll_freeze { get; set; }
- Efl.Ui.Scrollable.Interactive.scroll_hold { get; set; }
- Efl.Ui.Scrollable.Interactive.match_content { set; }
+ Efl.Ui.Scrollable_Interactive.content_size{ get; }
+ Efl.Ui.Scrollable_Interactive.viewport_geometry{ get; }
+ Efl.Ui.Scrollable_Interactive.bounce_enabled { set; get; }
+ Efl.Ui.Scrollable_Interactive.scroll_freeze { get; set; }
+ Efl.Ui.Scrollable_Interactive.scroll_hold { get; set; }
+ Efl.Ui.Scrollable_Interactive.match_content { set; }
Efl.Ui.Scrollbar.bar_mode { get; set; }
- Efl.Ui.Scrollable.Interactive.scroll;
+ Efl.Ui.Scrollable_Interactive.scroll;
}
}
diff --git a/src/lib/elementary/efl_ui_view_list.eo b/src/lib/elementary/efl_ui_view_list.eo
index fff2d9fba9..8b54fd3a26 100644
--- a/src/lib/elementary/efl_ui_view_list.eo
+++ b/src/lib/elementary/efl_ui_view_list.eo
@@ -6,7 +6,7 @@ struct Efl.Ui.View.List.Item_Event
child: Efl.Model;
index: int;
}
-class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable.Interactive, Efl.Ui.Scrollbar,
+class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager.Sub,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.View.List.Model)
{
@@ -83,10 +83,10 @@ class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View, Efl.Ui.Scrollable.Int
Efl.Ui.Focus.Composition.prepare;
Efl.Ui.View.model { get; set; }
- Efl.Ui.Scrollable.Interactive.viewport_geometry { get; }
- Efl.Ui.Scrollable.Interactive.content_pos { get; set; }
- Efl.Ui.Scrollable.Interactive.content_size { get; }
-// Efl.Ui.Scrollable.Interactive.scroll;
+ Efl.Ui.Scrollable_Interactive.viewport_geometry { get; }
+ Efl.Ui.Scrollable_Interactive.content_pos { get; set; }
+ Efl.Ui.Scrollable_Interactive.content_size { get; }
+// Efl.Ui.Scrollable_Interactive.scroll;
Efl.Layout.Signal.signal_callback_add;
Efl.Layout.Signal.signal_callback_del;
// Elm.Interface.Atspi_Accessible.children { get; }