[EGIT] [core/elementary] master 02/02: list: fix crash while setting nearest item in viewport
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=40dad8578e64b51a09b914afe2bdea72f16965b9
commit 40dad8578e64b51a09b914afe2bdea72f16965b9
Author: Amitesh Singh amitesh...@samsung.com
Date: Sat Aug 15 22:46:51 2015 +0530
list: fix crash while setting nearest item in viewport
This is an example of classic code copy and paste mistake.
Probably inspired from similar code in genlist/gengrid.
We were actually deleting the other items (except selected one) in
viewport in _elm_list_nearest_visible_item_get() which results into crash
while deleting the list object.
@fix
Resolves: T2662
---
src/lib/elm_list.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 739df22..7b4 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1233,7 +1233,6 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj,
Elm_List_Item_Data *it)
if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch)
!elm_object_item_disabled_get(EO_OBJ(item)))
{
- eina_list_free(item_list);
return item;
}
}
@@ -1248,12 +1247,10 @@ _elm_list_nearest_visible_item_get(Evas_Object *obj,
Elm_List_Item_Data *it)
if (ELM_RECTS_INCLUDE(vx, vy, vw, vh, cx, cy, cw, ch)
!elm_object_item_disabled_get(EO_OBJ(item)))
{
- eina_list_free(item_list);
return item;
}
}
}
- eina_list_free(item_list);
return it;
}
--
[EGIT] [core/elementary] master 01/02: popup: make scroller optional in popup
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0891ac5cfc2710d0c890340515aa5dbbe1f20466
commit 0891ac5cfc2710d0c890340515aa5dbbe1f20466
Author: Amitesh Singh amitesh...@samsung.com
Date: Sat Aug 15 21:02:33 2015 +0530
popup: make scroller optional in popup
Summary:
@feature
Resolves: T2651
Test Plan:
1. elementary_test -to popup
2. Enable/disable checkbox named Enable popup scoller
Reviewers: raster, herb, herdsman, SanghyeonLee, tasn, simotek, cedric,
jeffhoogland
Subscribers: seoz
Differential Revision: https://phab.enlightenment.org/D2945
---
data/themes/edc/elm/popup.edc| 17 +++-
data/themes/edc/elm/scroller.edc | 3 +-
src/bin/test_popup.c | 43 +
src/lib/elc_popup.c | 182 ++-
src/lib/elm_popup.eo | 21 +
src/lib/elm_widget_popup.h | 2 +
6 files changed, 225 insertions(+), 43 deletions(-)
diff --git a/data/themes/edc/elm/popup.edc b/data/themes/edc/elm/popup.edc
index 2ac2594..e49 100644
--- a/data/themes/edc/elm/popup.edc
+++ b/data/themes/edc/elm/popup.edc
@@ -367,11 +367,26 @@ group { name: elm/popup/base/default;
group { name: elm/popup/content/popup/default;
alias: elm/popup/content/popup/transparent;
alias: elm/popup/content/popup/subpopup;
+ data.item: scroller_enable on;
parts {
part { name:elm.swallow.content; type: SWALLOW;
description { state: default 0.0;
- min: 240 0;
}
+ description { state: scroll 0.0;
+min: 240 0;
+ }
+ }
+ }
+ programs {
+ program {
+ signal: elm,scroll,enable; source: elm;
+ action: STATE_SET scroll 0.0;
+ target: elm.swallow.content;
+ }
+ program {
+ signal: elm,scroll,disable; source: elm;
+ action: STATE_SET default 0.0;
+ target: elm.swallow.content;
}
}
}
diff --git a/data/themes/edc/elm/scroller.edc b/data/themes/edc/elm/scroller.edc
index cf1cb99..2f3d699 100644
--- a/data/themes/edc/elm/scroller.edc
+++ b/data/themes/edc/elm/scroller.edc
@@ -1308,8 +1308,7 @@ group { name: elm/scroller/contents/default;
group { name: elm/scroller/base/popup/no_inset_shadow;
inherit: elm/scroller/base/default;
parts {
- part { name: elm.swallow.content;
- type: SWALLOW;
+ part { name: elm.swallow.content; type: SWALLOW;
description { state: default 0.0;
rel1.offset: 0 0;
rel2.offset: 0 0;
diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c
index a2e576c..dcfba0e 100644
--- a/src/bin/test_popup.c
+++ b/src/bin/test_popup.c
@@ -13,6 +13,7 @@ typedef struct
static Evas_Object *g_popup = NULL;
static int times = 0;
+static Eina_Bool is_popup_scroll;
static Evas_Rel_Coord_Point _popup_point[POPUP_POINT_MAX] =
{
{ 0.01, 0.01 },
@@ -122,6 +123,7 @@ _popup_center_text_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Evas_Object *popup;
popup = elm_popup_add(data);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_text_set(popup, This Popup has content area and
timeout value is 3 seconds);
elm_popup_timeout_set(popup, 3.0);
@@ -142,6 +144,7 @@ _popup_center_text_1button_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Evas_Object *btn;
popup = elm_popup_add(data);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_object_text_set(popup, This Popup has content area and
action area set, action area has one button Close);
@@ -164,6 +167,7 @@ _popup_center_title_text_1button_cb(void *data, Evas_Object
*obj EINA_UNUSED,
Evas_Object *btn;
popup = elm_popup_add(data);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
// popup text
elm_object_text_set(popup, This Popup has title area, content area and
@@ -190,6 +194,7 @@ _popup_center_title_text_block_clicked_event_cb(void *data,
Evas_Object *popup;
popup = elm_popup_add(data);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
evas_object_smart_callback_add(popup, block,clicked, _block_clicked_cb,
NULL);
@@ -219,6 +224,7 @@
_popup_center_title_text_block_clicked_event_with_parent_cb(void *data,
evas_object_show(bg);
popup = elm_popup_add(bg);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
evas_object_smart_callback_add(popup, block,clicked,
_block_clicked_cb, bg);
@@ -244,6 +250,7 @@ _popup_bottom_title_text_3button_cb(void *data, Evas_Object
*obj EINA_UNUSED,
char buf[256];
popup = elm_popup_add(data);
+ elm_popup_scrollable_set(popup, is_popup_scroll);
elm_popup_orient_set(popup, ELM_POPUP_ORIENT_BOTTOM);
// popup text
@@ -292,6 +299,8 @@ _popup_center_title_content_3button_cb(void *data,
Evas_Object *obj
[EGIT] [core/elementary] master 01/01: popup: fix content_area resize in case of custom theme
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=24a7851807ac5ddd813837c58bc16145cdc8261e commit 24a7851807ac5ddd813837c58bc16145cdc8261e Author: Amitesh Singh amitesh...@samsung.com Date: Sun Aug 16 00:23:44 2015 +0530 popup: fix content_area resize in case of custom theme Send elm,scroll,enable/disable signals in theme_apply. It is a fix of 0891ac5cfc2710d0c89034 Thanks to Dave for reporting this issue. --- src/lib/elc_popup.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c index cbcab3c..12558f0 100644 --- a/src/lib/elc_popup.c +++ b/src/lib/elc_popup.c @@ -377,10 +377,14 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data *sd) elm_layout_signal_emit(sd-main_layout, elm,state,title,icon,visible, elm); _populate_theme_scroll(sd); - if (!sd-theme_scroll sd-scroll) + if (sd-scroll !sd-theme_scroll) sd-max_sc_w = 240 * elm_config_scale_get() * elm_object_scale_get(obj); else sd-max_sc_w = 0; + if (!sd-scroll sd-theme_scroll) + elm_layout_signal_emit(sd-content_area, elm,scroll,disable, elm); + else if (sd-scroll sd-theme_scroll) + elm_layout_signal_emit(sd-content_area, elm,scroll,enable, elm); _visuals_set(obj); _scroller_size_calc(obj); --
[EGIT] [core/efl] master 01/01: eina: change default log level at which we display backtrace.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=05c18876b3e2dba5dd7caea2517aaf24d92ab614 commit 05c18876b3e2dba5dd7caea2517aaf24d92ab614 Author: Cedric BAIL ced...@osg.samsung.com Date: Sat Aug 15 12:53:00 2015 +0200 eina: change default log level at which we display backtrace. We mostly use in our code base ERR in conjunction with system related error. This doesn't require any information from who did call that function to get debugged and is creating way to much noise with little value. --- src/lib/eina/eina_log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 6fc9626..a9eb9aa 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -121,7 +121,7 @@ static Eina_Bool _disable_timing = EINA_TRUE; static int _abort_level_on_critical = EINA_LOG_LEVEL_CRITICAL; #ifdef EINA_LOG_BACKTRACE -static int _backtrace_level = 2; // CRI ERR by default +static int _backtrace_level = 1; // CRI ERR by default #endif static Eina_Bool _threads_enabled = EINA_FALSE; --
[EGIT] [bindings/python/python-efl] master 01/01: GenlistItem.data is now also writable
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=40ac305d0dd586d29230cc71aedf501fbfb0d376 commit 40ac305d0dd586d29230cc71aedf501fbfb0d376 Author: Dave Andreoli d...@gurumeditation.it Date: Sat Aug 15 13:36:00 2015 +0200 GenlistItem.data is now also writable --- efl/elementary/genlist_item.pxi | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/efl/elementary/genlist_item.pxi b/efl/elementary/genlist_item.pxi index d74dbb0..c5eb23f 100644 --- a/efl/elementary/genlist_item.pxi +++ b/efl/elementary/genlist_item.pxi @@ -262,12 +262,21 @@ cdef class GenlistItem(ObjectItem): return self property data: -User data for the item. +User data (model) for the item. + +.. versionchanged:: 1.16 +Property is now also writable + + def __get__(self): return self.item_data +def __set__(self, data): +self.item_data = data def data_get(self): return self.item_data +def data_set(self, data): +self.item_data = data property next: This returns the item placed after the ``item``, on the container --
