summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmitesh Singh <amitesh.sh@samsung.com>2017-12-05 16:00:08 +0900
committerAmitesh Singh <amitesh.sh@samsung.com>2017-12-05 16:18:32 +0900
commitbdc396945281290c3d4b0622d9f9a3945af01097 (patch)
tree92a6f3a5a945e1fea5084163dffdb1d2ad9b92cf
parentc7aa3b2f83bfed886cf5bcd53dea21d0c9d11a99 (diff)
edje: rename intf Efl.Canvas.Layout_Group to Efl.Layout.Group
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/lib/edje/Edje_Eo.h2
-rw-r--r--src/lib/edje/Edje_Legacy.h2
-rw-r--r--src/lib/edje/edje_legacy.c4
-rw-r--r--src/lib/edje/edje_object.eo8
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/edje/edje_util.c6
-rw-r--r--src/lib/edje/efl_layout_group.eo (renamed from src/lib/edje/efl_canvas_layout_group.eo)2
-rw-r--r--src/lib/elementary/efl_ui_image.c8
-rw-r--r--src/lib/elementary/efl_ui_image.eo6
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c8
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo4
-rw-r--r--src/lib/elementary/efl_ui_layout.c14
-rw-r--r--src/lib/elementary/efl_ui_layout.eo8
14 files changed, 38 insertions, 38 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index e87c45e9e6..1f7ffe980f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,7 +4,7 @@
4edje_eolian_files = \ 4edje_eolian_files = \
5 lib/edje/efl_layout_calc.eo \ 5 lib/edje/efl_layout_calc.eo \
6 lib/edje/efl_layout_signal.eo \ 6 lib/edje/efl_layout_signal.eo \
7 lib/edje/efl_canvas_layout_group.eo \ 7 lib/edje/efl_layout_group.eo \
8 lib/edje/edje_object.eo \ 8 lib/edje/edje_object.eo \
9 lib/edje/efl_canvas_layout_part.eo \ 9 lib/edje/efl_canvas_layout_part.eo \
10 lib/edje/efl_canvas_layout_part_box.eo \ 10 lib/edje/efl_canvas_layout_part_box.eo \
diff --git a/src/lib/edje/Edje_Eo.h b/src/lib/edje/Edje_Eo.h
index cd2465e7ee..663d6c5244 100644
--- a/src/lib/edje/Edje_Eo.h
+++ b/src/lib/edje/Edje_Eo.h
@@ -2,7 +2,7 @@
2 2
3#include "efl_layout_calc.eo.h" 3#include "efl_layout_calc.eo.h"
4#include "efl_layout_signal.eo.h" 4#include "efl_layout_signal.eo.h"
5#include "efl_canvas_layout_group.eo.h" 5#include "efl_layout_group.eo.h"
6#include "edje_object.eo.h" 6#include "edje_object.eo.h"
7#include "edje_edit.eo.h" 7#include "edje_edit.eo.h"
8 8
diff --git a/src/lib/edje/Edje_Legacy.h b/src/lib/edje/Edje_Legacy.h
index aaecf138bc..730b6ff64b 100644
--- a/src/lib/edje/Edje_Legacy.h
+++ b/src/lib/edje/Edje_Legacy.h
@@ -3111,4 +3111,4 @@ typedef Efl_Canvas_Layout_Part_Type Edje_Part_Type;
3111 */ 3111 */
3112#include "edje_object.eo.legacy.h" 3112#include "edje_object.eo.legacy.h"
3113#include "edje_edit.eo.legacy.h" 3113#include "edje_edit.eo.legacy.h"
3114#include "efl_canvas_layout_group.eo.legacy.h" 3114#include "efl_layout_group.eo.legacy.h"
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 526b31a113..2ead3b40be 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -1188,7 +1188,7 @@ EAPI void
1188edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh) 1188edje_object_size_min_get(const Edje_Object *obj, int *minw, int *minh)
1189{ 1189{
1190 Eina_Size2D sz; 1190 Eina_Size2D sz;
1191 sz = efl_canvas_layout_group_size_min_get(obj); 1191 sz = efl_layout_group_size_min_get(obj);
1192 if (minw) *minw = sz.w; 1192 if (minw) *minw = sz.w;
1193 if (minh) *minh = sz.h; 1193 if (minh) *minh = sz.h;
1194} 1194}
@@ -1197,7 +1197,7 @@ EAPI void
1197edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh) 1197edje_object_size_max_get(const Edje_Object *obj, int *maxw, int *maxh)
1198{ 1198{
1199 Eina_Size2D sz; 1199 Eina_Size2D sz;
1200 sz = efl_canvas_layout_group_size_max_get(obj); 1200 sz = efl_layout_group_size_max_get(obj);
1201 if (maxw) *maxw = sz.w; 1201 if (maxw) *maxw = sz.w;
1202 if (maxh) *maxh = sz.h; 1202 if (maxh) *maxh = sz.h;
1203} 1203}
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index a23fb94aca..5af4a417b5 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -4,7 +4,7 @@ import edje_types;
4 4
5class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part, 5class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
6 Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc, 6 Efl.Observer, Efl.Ui.Base, Efl.Layout.Calc,
7 Efl.Layout.Signal, Efl.Canvas.Layout_Group, 7 Efl.Layout.Signal, Efl.Layout.Group,
8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, 8 Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
9 Efl.Gfx.Size_Class) 9 Efl.Gfx.Size_Class)
10{ 10{
@@ -115,9 +115,9 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
115 Efl.Layout.Calc.calc_freeze; 115 Efl.Layout.Calc.calc_freeze;
116 Efl.Layout.Calc.calc_thaw; 116 Efl.Layout.Calc.calc_thaw;
117 Efl.Layout.Calc.calc_force; 117 Efl.Layout.Calc.calc_force;
118 Efl.Canvas.Layout_Group.group_size_min { get; } 118 Efl.Layout.Group.group_size_min { get; }
119 Efl.Canvas.Layout_Group.group_size_max { get; } 119 Efl.Layout.Group.group_size_max { get; }
120 Efl.Canvas.Layout_Group.group_data { get; } 120 Efl.Layout.Group.group_data { get; }
121 Efl.Layout.Signal.message_send; 121 Efl.Layout.Signal.message_send;
122 Efl.Layout.Signal.signal_callback_add; 122 Efl.Layout.Signal.signal_callback_add;
123 Efl.Layout.Signal.signal_callback_del; 123 Efl.Layout.Signal.signal_callback_del;
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 2a029d7839..6c2406d13a 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -546,4 +546,4 @@ _edje_object_efl_player_play_speed_get(Eo *obj EINA_UNUSED, Edje *pd)
546#include "edje_global.eo.c" 546#include "edje_global.eo.c"
547#include "efl_layout_calc.eo.c" 547#include "efl_layout_calc.eo.c"
548#include "efl_layout_signal.eo.c" 548#include "efl_layout_signal.eo.c"
549#include "efl_canvas_layout_group.eo.c" 549#include "efl_layout_group.eo.c"
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index d941b8291b..3ff4c31b80 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -450,7 +450,7 @@ _edje_object_efl_ui_base_mirrored_set(Eo *obj, Edje *ed, Eina_Bool rtl)
450} 450}
451 451
452EOLIAN const char * 452EOLIAN const char *
453_edje_object_efl_canvas_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key) 453_edje_object_efl_layout_group_group_data_get(Eo *obj EINA_UNUSED, Edje *ed, const char *key)
454{ 454{
455 if (!key) return NULL; 455 if (!key) return NULL;
456 if (!ed->collection) return NULL; 456 if (!ed->collection) return NULL;
@@ -3316,7 +3316,7 @@ _edje_object_efl_part_part(Eo *obj, Edje *ed, const char *part)
3316} 3316}
3317 3317
3318EOLIAN Eina_Size2D 3318EOLIAN Eina_Size2D
3319_edje_object_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed) 3319_edje_object_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edje *ed)
3320{ 3320{
3321 if ((!ed) || (!ed->collection)) 3321 if ((!ed) || (!ed->collection))
3322 return EINA_SIZE2D(0, 0); 3322 return EINA_SIZE2D(0, 0);
@@ -3325,7 +3325,7 @@ _edje_object_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Edj
3325} 3325}
3326 3326
3327EOLIAN Eina_Size2D 3327EOLIAN Eina_Size2D
3328_edje_object_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED) 3328_edje_object_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Edje *ed EINA_UNUSED)
3329{ 3329{
3330 Eina_Size2D sz; 3330 Eina_Size2D sz;
3331 3331
diff --git a/src/lib/edje/efl_canvas_layout_group.eo b/src/lib/edje/efl_layout_group.eo
index 3c85ecee82..bd711e97ab 100644
--- a/src/lib/edje/efl_canvas_layout_group.eo
+++ b/src/lib/edje/efl_layout_group.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3interface Efl.Canvas.Layout_Group 3interface Efl.Layout.Group
4{ 4{
5 [[APIs representing static data from a group in an edje file. 5 [[APIs representing static data from a group in an edje file.
6 6
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 63933d8d27..ef34892c4e 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -1172,19 +1172,19 @@ _efl_ui_image_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Image_Da
1172} 1172}
1173 1173
1174EOLIAN static Eina_Size2D 1174EOLIAN static Eina_Size2D
1175_efl_ui_image_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1175_efl_ui_image_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1176{ 1176{
1177 if (sd->edje) 1177 if (sd->edje)
1178 return efl_canvas_layout_group_size_min_get(sd->img); 1178 return efl_layout_group_size_min_get(sd->img);
1179 else 1179 else
1180 return EINA_SIZE2D(0, 0); 1180 return EINA_SIZE2D(0, 0);
1181} 1181}
1182 1182
1183EOLIAN static Eina_Size2D 1183EOLIAN static Eina_Size2D
1184_efl_ui_image_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) 1184_efl_ui_image_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
1185{ 1185{
1186 if (sd->edje) 1186 if (sd->edje)
1187 return efl_canvas_layout_group_size_max_get(sd->img); 1187 return efl_layout_group_size_max_get(sd->img);
1188 else 1188 else
1189 return EINA_SIZE2D(0, 0); 1189 return EINA_SIZE2D(0, 0);
1190} 1190}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 906549689b..91a601c036 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -48,7 +48,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
48 Efl.Access.Image, Efl.Access.Widget.Action, 48 Efl.Access.Image, Efl.Access.Widget.Action,
49 Efl.Orientation, Efl.Flipable, 49 Efl.Orientation, Efl.Flipable,
50 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc, 50 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
51 Efl.Canvas.Layout_Group, Efl.Layout.Signal) 51 Efl.Layout.Group, Efl.Layout.Signal)
52{ 52{
53 [[ Efl UI image class]] 53 [[ Efl UI image class]]
54 event_prefix: efl_ui_image; 54 event_prefix: efl_ui_image;
@@ -138,8 +138,8 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
138 Efl.Player.playable { get; } 138 Efl.Player.playable { get; }
139 Efl.Player.play { get; set; } 139 Efl.Player.play { get; set; }
140 Efl.Layout.Signal.signal_emit; 140 Efl.Layout.Signal.signal_emit;
141 Efl.Canvas.Layout_Group.group_size_min { get; } 141 Efl.Layout.Group.group_size_min { get; }
142 Efl.Canvas.Layout_Group.group_size_max { get; } 142 Efl.Layout.Group.group_size_max { get; }
143 //Efl.Canvas.Layout_Group.group_data { get; } 143 //Efl.Canvas.Layout_Group.group_data { get; }
144 Efl.Layout.Calc.calc_size_min; 144 Efl.Layout.Calc.calc_size_min;
145 Efl.Layout.Calc.calc_force; 145 Efl.Layout.Calc.calc_force;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 388235f416..09321aab70 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1552,19 +1552,19 @@ _efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Imag
1552} 1552}
1553 1553
1554EOLIAN static Eina_Size2D 1554EOLIAN static Eina_Size2D
1555_efl_ui_image_zoomable_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 1555_efl_ui_image_zoomable_efl_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1556{ 1556{
1557 if (sd->edje) 1557 if (sd->edje)
1558 return efl_canvas_layout_group_size_min_get(sd->edje); 1558 return efl_layout_group_size_min_get(sd->edje);
1559 else 1559 else
1560 return EINA_SIZE2D(0, 0); 1560 return EINA_SIZE2D(0, 0);
1561} 1561}
1562 1562
1563EOLIAN static Eina_Size2D 1563EOLIAN static Eina_Size2D
1564_efl_ui_image_zoomable_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd) 1564_efl_ui_image_zoomable_efl_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
1565{ 1565{
1566 if (sd->edje) 1566 if (sd->edje)
1567 return efl_canvas_layout_group_size_max_get(sd->edje); 1567 return efl_layout_group_size_max_get(sd->edje);
1568 else 1568 else
1569 return EINA_SIZE2D(0, 0); 1569 return EINA_SIZE2D(0, 0);
1570} 1570}
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 9549e1f4f2..62dc1b15e7 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -66,8 +66,8 @@ class Efl.Ui.Image_Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom,
66 Efl.File.file { get; set; } 66 Efl.File.file { get; set; }
67 Efl.Orientation.orientation { get; set; } 67 Efl.Orientation.orientation { get; set; }
68 Efl.Flipable.flip { get; set; } 68 Efl.Flipable.flip { get; set; }
69 Efl.Canvas.Layout_Group.group_size_min { get; } 69 Efl.Layout.Group.group_size_min { get; }
70 Efl.Canvas.Layout_Group.group_size_max { get; } 70 Efl.Layout.Group.group_size_max { get; }
71 //Efl.Canvas.Layout_Group.group_data { get; } 71 //Efl.Canvas.Layout_Group.group_data { get; }
72 } 72 }
73 events { 73 events {
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index c86c636670..2ed5db22cc 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1549,27 +1549,27 @@ elm_layout_edje_get(const Eo *obj)
1549} 1549}
1550 1550
1551EOLIAN static const char * 1551EOLIAN static const char *
1552_efl_ui_layout_efl_canvas_layout_group_group_data_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key) 1552_efl_ui_layout_efl_layout_group_group_data_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED, const char *key)
1553{ 1553{
1554 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1554 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1555 1555
1556 return efl_canvas_layout_group_data_get(wd->resize_obj, key); 1556 return efl_layout_group_data_get(wd->resize_obj, key);
1557} 1557}
1558 1558
1559EOLIAN static Eina_Size2D 1559EOLIAN static Eina_Size2D
1560_efl_ui_layout_efl_canvas_layout_group_group_size_min_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) 1560_efl_ui_layout_efl_layout_group_group_size_min_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
1561{ 1561{
1562 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); 1562 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
1563 1563
1564 return efl_canvas_layout_group_size_min_get(wd->resize_obj); 1564 return efl_layout_group_size_min_get(wd->resize_obj);
1565} 1565}
1566 1566
1567EOLIAN static Eina_Size2D 1567EOLIAN static Eina_Size2D
1568_efl_ui_layout_efl_canvas_layout_group_group_size_max_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED) 1568_efl_ui_layout_efl_layout_group_group_size_max_get(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_UNUSED)
1569{ 1569{
1570 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0)); 1570 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_SIZE2D(0, 0));
1571 1571
1572 return efl_canvas_layout_group_size_max_get(wd->resize_obj); 1572 return efl_layout_group_size_max_get(wd->resize_obj);
1573} 1573}
1574 1574
1575/* layout's sizing evaluation is deferred. evaluation requests are 1575/* layout's sizing evaluation is deferred. evaluation requests are
@@ -2358,7 +2358,7 @@ elm_layout_signal_emit(Eo *obj, const char *emission, const char *source)
2358EAPI const char * 2358EAPI const char *
2359elm_layout_data_get(const Evas_Object *obj, const char *key) 2359elm_layout_data_get(const Evas_Object *obj, const char *key)
2360{ 2360{
2361 return efl_canvas_layout_group_data_get(obj, key); 2361 return efl_layout_group_data_get(obj, key);
2362} 2362}
2363 2363
2364EAPI Eina_Bool 2364EAPI Eina_Bool
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index 45b163ce02..b4f4bdf9f5 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,7 +1,7 @@
1class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File, 1class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect, 2 Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Model.Factory.Connect,
3 Efl.Layout.Calc, Efl.Layout.Signal, 3 Efl.Layout.Calc, Efl.Layout.Signal,
4 Efl.Canvas.Layout_Group) 4 Efl.Layout.Group)
5{ 5{
6 [[Elementary layout class]] 6 [[Elementary layout class]]
7 methods { 7 methods {
@@ -55,9 +55,9 @@ class Efl.Ui.Layout (Elm.Widget, Efl.Part, Efl.Container, Efl.File,
55 Efl.Layout.Signal.signal_emit; 55 Efl.Layout.Signal.signal_emit;
56 Efl.Layout.Signal.message_send; 56 Efl.Layout.Signal.message_send;
57 Efl.Layout.Signal.signal_process; 57 Efl.Layout.Signal.signal_process;
58 Efl.Canvas.Layout_Group.group_data { get; } 58 Efl.Layout.Group.group_data { get; }
59 Efl.Canvas.Layout_Group.group_size_min { get; } 59 Efl.Layout.Group.group_size_min { get; }
60 Efl.Canvas.Layout_Group.group_size_max { get; } 60 Efl.Layout.Group.group_size_max { get; }
61 Elm.Widget.widget_sub_object_add; 61 Elm.Widget.widget_sub_object_add;
62 Elm.Widget.theme_apply; 62 Elm.Widget.theme_apply;
63 Elm.Widget.on_disabled_update; 63 Elm.Widget.on_disabled_update;