summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-10 10:30:19 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-09-10 10:30:19 +0200
commit279b7c3d808e01b27e8398db94479aa9f007e165 (patch)
tree559637a7617a3b2a929c6d7ec75c1b08788541d8
parentc695bfd5e25b40f2ab0ee68412781be650795ab7 (diff)
fixes needed after rebase
-rw-r--r--src/examples/elementary/efl_ui_collection_view_example_1.c4
-rw-r--r--src/lib/elementary/efl_ui_collection_view.c6
-rw-r--r--src/lib/elementary/efl_ui_collection_view.eo7
3 files changed, 7 insertions, 10 deletions
diff --git a/src/examples/elementary/efl_ui_collection_view_example_1.c b/src/examples/elementary/efl_ui_collection_view_example_1.c
index ba564188bf..81bf265aaa 100644
--- a/src/examples/elementary/efl_ui_collection_view_example_1.c
+++ b/src/examples/elementary/efl_ui_collection_view_example_1.c
@@ -73,7 +73,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
73 Efl_Ui_Factory *factory; 73 Efl_Ui_Factory *factory;
74 Evas_Object *win, *li; 74 Evas_Object *win, *li;
75 Eo *model; 75 Eo *model;
76 Efl_Select_Model *selmodel; 76 Efl_Ui_Select_Model *selmodel;
77 Eina_Value w, h; 77 Eina_Value w, h;
78 Eo *position_manager; 78 Eo *position_manager;
79 const Efl_Class *item_class; 79 const Efl_Class *item_class;
@@ -104,7 +104,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
104 efl_model_property_set(model, "item.width", &w); 104 efl_model_property_set(model, "item.width", &w);
105 efl_model_property_set(model, "item.height", &h); 105 efl_model_property_set(model, "item.height", &h);
106 106
107 selmodel = efl_add(EFL_SELECT_MODEL_CLASS, efl_main_loop_get() 107 selmodel = efl_add(EFL_UI_SELECT_MODEL_CLASS, efl_main_loop_get()
108 , efl_ui_view_model_set(efl_added, model) 108 , efl_ui_view_model_set(efl_added, model)
109 ); 109 );
110 110
diff --git a/src/lib/elementary/efl_ui_collection_view.c b/src/lib/elementary/efl_ui_collection_view.c
index facadc587c..36ec8764b3 100644
--- a/src/lib/elementary/efl_ui_collection_view.c
+++ b/src/lib/elementary/efl_ui_collection_view.c
@@ -1709,11 +1709,11 @@ _efl_ui_collection_view_model_changed(void *data, const Efl_Event *event)
1709 eina_iterator_free(it); 1709 eina_iterator_free(it);
1710 1710
1711 // Push selection model first 1711 // Push selection model first
1712 if (!selection) model = efl_add(EFL_SELECT_MODEL_CLASS, data, 1712 if (!selection) model = efl_add(EFL_UI_SELECT_MODEL_CLASS, data,
1713 efl_ui_view_model_set(efl_added, ev->current)); 1713 efl_ui_view_model_set(efl_added, ev->current));
1714 if (!sizing) model = efl_add(EFL_UI_HOMOGENEOUS_MODEL_CLASS, data, 1714 if (!sizing) model = efl_add(EFL_UI_HOMOGENEOUS_MODEL_CLASS, data,
1715 efl_ui_view_model_set(efl_added, model ? model : ev->current)); 1715 efl_ui_view_model_set(efl_added, model ? model : ev->current));
1716 if (!model) model = efl_add(EFL_VIEW_MODEL_CLASS, data, 1716 if (!model) model = efl_add(EFL_UI_VIEW_MODEL_CLASS, data,
1717 efl_ui_view_model_set(efl_added, ev->current)); 1717 efl_ui_view_model_set(efl_added, ev->current));
1718 1718
1719 count = efl_model_children_count_get(model); 1719 count = efl_model_children_count_get(model);
@@ -1792,7 +1792,7 @@ _efl_ui_collection_view_efl_object_constructor(Eo *obj, Efl_Ui_Collection_View_D
1792 obj = efl_constructor(efl_super(obj, EFL_UI_COLLECTION_VIEW_CLASS)); 1792 obj = efl_constructor(efl_super(obj, EFL_UI_COLLECTION_VIEW_CLASS));
1793 1793
1794 if (!elm_widget_theme_klass_get(obj)) 1794 if (!elm_widget_theme_klass_get(obj))
1795 elm_widget_theme_klass_set(obj, "item_container"); 1795 elm_widget_theme_klass_set(obj, "collection");
1796 1796
1797 efl_wref_add(efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(obj)), &pd->sizer); 1797 efl_wref_add(efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(obj)), &pd->sizer);
1798 efl_gfx_color_set(pd->sizer, 0, 0, 0, 0); 1798 efl_gfx_color_set(pd->sizer, 0, 0, 0, 0);
diff --git a/src/lib/elementary/efl_ui_collection_view.eo b/src/lib/elementary/efl_ui_collection_view.eo
index a0e4312a2d..3eb3de05dc 100644
--- a/src/lib/elementary/efl_ui_collection_view.eo
+++ b/src/lib/elementary/efl_ui_collection_view.eo
@@ -12,6 +12,7 @@ class @beta Efl.Ui.Collection_View extends Efl.Ui.Layout_Base implements
12 Efl.Ui.Multi_Selectable, 12 Efl.Ui.Multi_Selectable,
13 Efl.Ui.Focus.Manager_Sub, 13 Efl.Ui.Focus.Manager_Sub,
14 Efl.Ui.Widget_Focus_Manager 14 Efl.Ui.Widget_Focus_Manager
15 composite Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
15 16
16{ 17{
17 methods { 18 methods {
@@ -26,7 +27,7 @@ class @beta Efl.Ui.Collection_View extends Efl.Ui.Layout_Base implements
26 @property position_manager { 27 @property position_manager {
27 [[Position manager object that handles placement of items.]] 28 [[Position manager object that handles placement of items.]]
28 values { 29 values {
29 position_manager : Efl.Ui.Position_Manager.Entity @owned; [[The objects ownership is passed to the item container.]] 30 position_manager : Efl.Ui.Position_Manager.Entity @move; [[The objects ownership is passed to the item container.]]
30 } 31 }
31 } 32 }
32 } 33 }
@@ -51,8 +52,4 @@ class @beta Efl.Ui.Collection_View extends Efl.Ui.Layout_Base implements
51 item,highlighted : Efl.Ui.Collection_View_Item_Event; 52 item,highlighted : Efl.Ui.Collection_View_Item_Event;
52 item,unhighlighted : Efl.Ui.Collection_View_Item_Event; 53 item,unhighlighted : Efl.Ui.Collection_View_Item_Event;
53 } 54 }
54 composite {
55 Efl.Ui.Scrollable_Interactive;
56 Efl.Ui.Scrollbar;
57 }
58} 55}