From: Enlightenment S. <no-...@en...> - 2013-02-19 15:11:57
|
Log: popups... STAY UP! Author: raster Date: 2013-02-19 07:11:46 -0800 (Tue, 19 Feb 2013) New Revision: 84240 Trac: http://trac.enlightenment.org/e/changeset/84240 Modified: trunk/e/src/bin/e_popup.c Modified: trunk/e/src/bin/e_popup.c =================================================================== --- trunk/e/src/bin/e_popup.c 2013-02-19 14:29:57 UTC (rev 84239) +++ trunk/e/src/bin/e_popup.c 2013-02-19 15:11:46 UTC (rev 84240) @@ -69,12 +69,15 @@ _e_popup_autoclose_mouse_up_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Mouse_Button *ev = event; - - if (autoclose_event && ((!autoclose_down_obj) || (ev->event_window != e_comp_get(autoclose_popup)->ee_win))) +/* + if (autoclose_event && + ((!autoclose_down_obj) || + (ev->event_window != e_comp_get(autoclose_popup)->ee_win))) _e_popup_autoclose_cleanup(); else autoclose_event++; autoclose_down_obj = 0; + */ return ECORE_CALLBACK_RENEW; } |
From: Enlightenment S. <no-...@en...> - 2013-02-21 01:11:08
|
Log: fix valgrind null evas problem with preview. fix preview aspect ratio out-of-bounds packing with videos when not widescreen. :) Author: raster Date: 2013-02-20 17:11:00 -0800 (Wed, 20 Feb 2013) New Revision: 84267 Trac: http://trac.enlightenment.org/e/changeset/84267 Modified: trunk/e/src/bin/e_widget_filepreview.c trunk/e/src/bin/e_widget_preview.c Modified: trunk/e/src/bin/e_widget_filepreview.c =================================================================== --- trunk/e/src/bin/e_widget_filepreview.c 2013-02-20 21:30:18 UTC (rev 84266) +++ trunk/e/src/bin/e_widget_filepreview.c 2013-02-21 01:11:00 UTC (rev 84267) @@ -220,8 +220,9 @@ { double t, tot, ratio; int iw, ih; - Evas_Coord w, h; + Evas_Coord w, h, mw, mh, ow, oh; + evas_object_geometry_get(wd->o_preview_preview, NULL, NULL, &ow, &oh); evas_object_geometry_get(wd->o_preview_properties_table, NULL, NULL, &w, &h); tot = emotion_object_play_length_get(obj); @@ -236,10 +237,23 @@ if (ratio > 0.0) iw = (ih * ratio) + 0.5; if (iw < 1) iw = 1; if (ih < 1) ih = 1; - e_widget_preview_vsize_set(wd->o_preview_preview, w, (w * ih) / iw); - e_widget_size_min_set(wd->o_preview_preview, w, (w * ih) / iw); + + w = w; + h = (w * ih) / iw; + e_widget_preview_vsize_set(wd->o_preview_preview, w, h); + if (h > oh) + { + w = (w * oh) / h; + h = oh; + } + e_widget_size_min_set(wd->o_preview_preview, w, h); e_widget_table_object_repack(wd->o_preview_properties_table, wd->o_preview_preview, 0, 0, 2, 2, 0, 0, 1, 1); + e_widget_list_object_repack(wd->o_preview_list, + wd->o_preview_properties_table, + 1, 1, 0.5); + e_widget_size_min_get(wd->o_preview_list, &mw, &mh); + e_widget_size_min_set(wd->obj, mw, mh); } static void Modified: trunk/e/src/bin/e_widget_preview.c =================================================================== --- trunk/e/src/bin/e_widget_preview.c 2013-02-20 21:30:18 UTC (rev 84266) +++ trunk/e/src/bin/e_widget_preview.c 2013-02-21 01:11:00 UTC (rev 84267) @@ -25,23 +25,23 @@ if (!wd) return NULL; wd->obj = obj; - + wd->o_frame = edje_object_add(evas); e_theme_edje_object_set(wd->o_frame, "base/theme/widgets", "e/widgets/preview"); evas_object_show(wd->o_frame); e_widget_sub_object_add(obj, wd->o_frame); e_widget_resize_object_set(obj, wd->o_frame); - + wd->img = e_livethumb_add(evas); e_livethumb_vsize_set(wd->img, minw * 2, minh * 2); edje_extern_object_min_size_set(wd->img, minw, minh); /* Why do we set max size? This prevents from being nicely resized. */ /* edje_extern_object_max_size_set(o, minw, minh); */ -// evas_object_show(wd->img); - edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); + evas_object_show(wd->img); e_widget_sub_object_add(obj, wd->img); - + edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); + e_widget_data_set(obj, wd); e_widget_can_focus_set(obj, 0); edje_object_size_min_calc(wd->o_frame, &mw, &mh); @@ -78,7 +78,6 @@ wd = e_widget_data_get(obj); if (wd->o_thumb) evas_object_del(wd->o_thumb); - wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img)); e_icon_fill_inside_set(wd->o_thumb, 0); e_icon_file_key_set(wd->o_thumb, file, key); @@ -96,36 +95,29 @@ E_Widget_Data *wd; wd = e_widget_data_get(obj); - if (wd->img) - { - e_widget_sub_object_del(obj, wd->img); - evas_object_del(wd->img); - } - - wd->img = e_thumb_icon_add(evas_object_evas_get(obj)); - e_widget_sub_object_add(obj, wd->img); + if (wd->o_thumb) evas_object_del(wd->o_thumb); + wd->o_thumb = e_thumb_icon_add(e_livethumb_evas_get(wd->img)); if (eina_str_has_extension(file, "edj")) { if (key) - e_thumb_icon_file_set(wd->img, file, key); + e_thumb_icon_file_set(wd->o_thumb, file, key); else /* FIXME: There is probably a quicker way of doing this. */ if (edje_file_group_exists(file, "icon")) - e_thumb_icon_file_set(wd->img, file, "icon"); + e_thumb_icon_file_set(wd->o_thumb, file, "icon"); else if (edje_file_group_exists(file, "e/desktop/background")) - e_thumb_icon_file_set(wd->img, file, "e/desktop/background"); + e_thumb_icon_file_set(wd->o_thumb, file, "e/desktop/background"); else if (edje_file_group_exists(file, "e/init/splash")) - e_thumb_icon_file_set(wd->img, file, "e/init/splash"); + e_thumb_icon_file_set(wd->o_thumb, file, "e/init/splash"); } else - e_thumb_icon_file_set(wd->img, file, NULL); - evas_object_smart_callback_add(wd->img, "e_thumb_gen", _e_wid_preview_thumb_gen, wd); - e_thumb_icon_size_set(wd->img, w, h); - e_thumb_icon_begin(wd->img); + e_thumb_icon_file_set(wd->o_thumb, file, NULL); + evas_object_smart_callback_add(wd->o_thumb, "e_thumb_gen", + _e_wid_preview_thumb_gen, wd); + e_thumb_icon_size_set(wd->o_thumb, w, h); + e_thumb_icon_begin(wd->o_thumb); + e_livethumb_thumb_set(wd->img, wd->o_thumb); - edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); - evas_object_show(wd->img); - e_widget_change(obj); return 1; @@ -138,24 +130,20 @@ wd = e_widget_data_get(obj); e_livethumb_vsize_set(wd->img, w, h); + e_widget_size_min_set(wd->obj, w, h); + evas_object_smart_callback_call(wd->obj, "preview_update", NULL); + e_widget_change(wd->obj); } static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Coord w, h; E_Widget_Data *wd; wd = data; - e_icon_size_get(wd->img, &w, &h); - edje_extern_object_min_size_set(wd->img, w, h); - /* Why do we set max size? This prevents from being nicely resized. */ - /* edje_extern_object_max_size_set(wd->img, w, h); */ - edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img); - edje_object_size_min_calc(wd->o_frame, &w, &h); - e_widget_size_min_set(wd->obj, w, h); - evas_object_resize(wd->obj, w, h); + evas_object_show(wd->o_thumb); evas_object_smart_callback_call(wd->obj, "preview_update", NULL); + e_widget_change(wd->obj); } EAPI void @@ -178,9 +166,7 @@ wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img)); ret = edje_object_file_set(wd->o_thumb, file, group); e_livethumb_thumb_set(wd->img, wd->o_thumb); - e_widget_change(obj); - return ret; } |
From: Enlightenment S. <no-...@en...> - 2013-02-21 03:53:57
|
Log: eobj referenced in struct but only reffed intermittenytly - ref for as long as there is a handle. avoid segvs! Author: raster Date: 2013-02-20 19:53:49 -0800 (Wed, 20 Feb 2013) New Revision: 84271 Trac: http://trac.enlightenment.org/e/changeset/84271 Modified: trunk/e/src/bin/e_comp.c Modified: trunk/e/src/bin/e_comp.c =================================================================== --- trunk/e/src/bin/e_comp.c 2013-02-21 03:42:04 UTC (rev 84270) +++ trunk/e/src/bin/e_comp.c 2013-02-21 03:53:49 UTC (rev 84271) @@ -1522,8 +1522,8 @@ cw->force = 1; if (cw->delete_me) { - if (cw->real_obj && cw->eobj) - e_object_unref(cw->eobj); +// if (cw->real_obj && cw->eobj) +// e_object_unref(E_OBJECT(cw->eobj)); _e_comp_win_del(cw); } else cw->force = 0; @@ -1955,6 +1955,7 @@ CRI("UNHANDLED"); } cw->eobj = eobj; + e_object_ref(E_OBJECT(cw->eobj)); } else { @@ -2187,6 +2188,11 @@ { Evas_Object *o; + if (cw->real_obj && cw->eobj) + { + e_object_unref(E_OBJECT(cw->eobj)); + cw->eobj = NULL; + } if (cw->animating) { cw->c->animating--; @@ -2450,8 +2456,8 @@ cw->c->animating++; } cw->animating = 1; - if (cw->real_obj && cw->eobj) - e_object_ref(cw->eobj); +// if (cw->real_obj && cw->eobj) +// e_object_ref(cw->eobj); _e_comp_win_render_queue(cw); cw->pending_count++; |
From: Enlightenment S. <no-...@en...> - 2013-02-21 03:59:50
|
Log: valgrind unhapiness... silenced... mysterious as to why this happens as there are no entires up? Author: raster Date: 2013-02-20 19:59:42 -0800 (Wed, 20 Feb 2013) New Revision: 84272 Trac: http://trac.enlightenment.org/e/changeset/84272 Modified: trunk/e/src/bin/e_widget_entry.c Modified: trunk/e/src/bin/e_widget_entry.c =================================================================== --- trunk/e/src/bin/e_widget_entry.c 2013-02-21 03:53:49 UTC (rev 84271) +++ trunk/e/src/bin/e_widget_entry.c 2013-02-21 03:59:42 UTC (rev 84272) @@ -199,6 +199,10 @@ if (!(obj) || (!(wd = e_widget_data_get(obj)))) return; + evas_object_del(wd->o_entry); + evas_object_del(wd->o_inout); + wd->o_entry = NULL; + wd->o_inout = NULL; free(wd); } |
From: Enlightenment S. <no-...@en...> - 2013-02-21 04:01:43
|
Log: more valgrind stuff... null deref? Author: raster Date: 2013-02-20 20:01:36 -0800 (Wed, 20 Feb 2013) New Revision: 84273 Trac: http://trac.enlightenment.org/e/changeset/84273 Modified: trunk/e/src/bin/e_gadcon_popup.c Modified: trunk/e/src/bin/e_gadcon_popup.c =================================================================== --- trunk/e/src/bin/e_gadcon_popup.c 2013-02-21 03:59:42 UTC (rev 84272) +++ trunk/e/src/bin/e_gadcon_popup.c 2013-02-21 04:01:36 UTC (rev 84273) @@ -8,6 +8,7 @@ E_Event_Desk_After_Show *ev = event; E_Gadcon_Popup *pop = data; + if (!pop) return ECORE_CALLBACK_RENEW; if (!pop->win->visible) return ECORE_CALLBACK_RENEW; if (!e_gadcon_client_visible_get(pop->gcc, ev->desk)) e_object_del(E_OBJECT(pop)); @@ -21,6 +22,7 @@ E_Event_Border_Fullscreen *ev = event; E_Gadcon_Popup *pop = data; + if (!pop) return ECORE_CALLBACK_RENEW; if (!pop->win->visible) return ECORE_CALLBACK_RENEW; if (!ev->border->fullscreen) return ECORE_CALLBACK_RENEW; if (e_gadcon_client_visible_get(pop->gcc, ev->border->desk)) |