davemds pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d1cb369623417bda16a3fa7628e40b6b9605a5ca
commit d1cb369623417bda16a3fa7628e40b6b9605a5ca Author: Dave Andreoli <[email protected]> Date: Sat Jan 28 18:02:58 2017 +0100 mem gadget: formatting, fit into 80 cols no functional changes --- src/modules/sysinfo/memusage/memusage.c | 70 ++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index 61ae187..4eab289 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -34,8 +34,9 @@ _memusage_face_update(Instance *inst, int mem, int swap) if (inst->cfg->memusage.popup) { char text[4096]; - snprintf(text, sizeof(text), "%s: %d%%<br>%s: %d%%", _("Total Memory Usage"), - inst->cfg->memusage.real, _("Total Swap Usage"), inst->cfg->memusage.swap); + snprintf(text, sizeof(text), "%s: %d%%<br>%s: %d%%", + _("Total Memory Usage"), inst->cfg->memusage.real, + _("Total Swap Usage"), inst->cfg->memusage.swap); elm_object_text_set(inst->cfg->memusage.popup_label, text); } } @@ -84,11 +85,14 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U } popup = elm_ctxpopup_add(e_comp->elm); elm_object_style_set(popup, "noblock"); - evas_object_smart_callback_add(popup, "dismissed", _memusage_popup_dismissed, inst); - evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _memusage_popup_deleted, inst); - - snprintf(text, sizeof(text), "%s: %d%%<br>%s: %d%%", _("Total Memory Usage"), - inst->cfg->memusage.real, _("Total Swap Usage"), inst->cfg->memusage.swap); + evas_object_smart_callback_add(popup, "dismissed", + _memusage_popup_dismissed, inst); + evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, + _memusage_popup_deleted, inst); + + snprintf(text, sizeof(text), "%s: %d%%<br>%s: %d%%", + _("Total Memory Usage"), inst->cfg->memusage.real, + _("Total Swap Usage"), inst->cfg->memusage.swap); label = elm_label_add(popup); elm_object_style_set(label, "marker"); elm_object_text_set(label, text); @@ -98,7 +102,8 @@ _memusage_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U e_comp_object_util_autoclose(popup, NULL, NULL, NULL); evas_object_show(popup); - e_gadget_util_ctxpopup_place(inst->o_main, popup, inst->cfg->memusage.o_gadget); + e_gadget_util_ctxpopup_place(inst->o_main, popup, + inst->cfg->memusage.o_gadget); inst->cfg->memusage.popup = popup; } else @@ -123,11 +128,14 @@ _memusage_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE Evas_Coord w, h; Instance *inst = data; - edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->memusage.o_gadget), 0, 0, &w, &h); + edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->memusage.o_gadget), + 0, 0, &w, &h); if (inst->cfg->esm == E_SYSINFO_MODULE_MEMUSAGE) - evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h); + evas_object_size_hint_aspect_set(inst->o_main, + EVAS_ASPECT_CONTROL_BOTH, w, h); else - evas_object_size_hint_aspect_set(inst->cfg->memusage.o_gadget, EVAS_ASPECT_CONTROL_BOTH, w, h); + evas_object_size_hint_aspect_set(inst->cfg->memusage.o_gadget, + EVAS_ASPECT_CONTROL_BOTH, w, h); } static void @@ -161,7 +169,8 @@ _memusage_cb_usage_check_notify(void *data, Instance *inst = thc->inst; if (!inst->cfg) return; - if (inst->cfg->esm != E_SYSINFO_MODULE_MEMUSAGE && inst->cfg->esm != E_SYSINFO_MODULE_SYSINFO) return; + if (inst->cfg->esm != E_SYSINFO_MODULE_MEMUSAGE && + inst->cfg->esm != E_SYSINFO_MODULE_SYSINFO) return; inst->cfg->memusage.real = thc->memstatus; inst->cfg->memusage.swap = thc->swapstatus; @@ -209,7 +218,8 @@ _memusage_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data) ecore_thread_cancel(inst->cfg->memusage.usage_check_thread); inst->cfg->memusage.usage_check_thread = NULL; } - evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_memusage_remove, data); + evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL, + sysinfo_memusage_remove, data); sysinfo_config->items = eina_list_remove(sysinfo_config->items, inst->cfg); E_FREE(inst->cfg); @@ -252,10 +262,15 @@ _memusage_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED) E_EXPAND(inst->cfg->memusage.o_gadget); E_FILL(inst->cfg->memusage.o_gadget); elm_box_pack_end(inst->o_main, inst->cfg->memusage.o_gadget); - evas_object_event_callback_add(inst->cfg->memusage.o_gadget, EVAS_CALLBACK_MOUSE_DOWN, _memusage_mouse_down_cb, inst); - evas_object_event_callback_add(inst->cfg->memusage.o_gadget, EVAS_CALLBACK_RESIZE, _memusage_resize_cb, inst); + evas_object_event_callback_add(inst->cfg->memusage.o_gadget, + EVAS_CALLBACK_MOUSE_DOWN, + _memusage_mouse_down_cb, inst); + evas_object_event_callback_add(inst->cfg->memusage.o_gadget, + EVAS_CALLBACK_RESIZE, + _memusage_resize_cb, inst); evas_object_show(inst->cfg->memusage.o_gadget); - evas_object_smart_callback_del_full(obj, "gadget_created", _memusage_created_cb, data); + evas_object_smart_callback_del_full(obj, "gadget_created", + _memusage_created_cb, data); _memusage_config_updated(inst); } @@ -263,12 +278,17 @@ Evas_Object * sysinfo_memusage_create(Evas_Object *parent, Instance *inst) { inst->cfg->memusage.o_gadget = elm_layout_add(parent); - e_theme_edje_object_set(inst->cfg->memusage.o_gadget, "base/theme/modules/memusage", + e_theme_edje_object_set(inst->cfg->memusage.o_gadget, + "base/theme/modules/memusage", "e/modules/memusage/main"); E_EXPAND(inst->cfg->memusage.o_gadget); E_FILL(inst->cfg->memusage.o_gadget); - evas_object_event_callback_add(inst->cfg->memusage.o_gadget, EVAS_CALLBACK_MOUSE_DOWN, _memusage_mouse_down_cb, inst); - evas_object_event_callback_add(inst->cfg->memusage.o_gadget, EVAS_CALLBACK_RESIZE, _memusage_resize_cb, inst); + evas_object_event_callback_add(inst->cfg->memusage.o_gadget, + EVAS_CALLBACK_MOUSE_DOWN, + _memusage_mouse_down_cb, inst); + evas_object_event_callback_add(inst->cfg->memusage.o_gadget, + EVAS_CALLBACK_RESIZE, + _memusage_resize_cb, inst); evas_object_show(inst->cfg->memusage.o_gadget); _memusage_config_updated(inst); @@ -321,15 +341,17 @@ memusage_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_U inst->o_main = elm_box_add(parent); E_EXPAND(inst->o_main); evas_object_data_set(inst->o_main, "Instance", inst); - evas_object_smart_callback_add(parent, "gadget_created", _memusage_created_cb, inst); - evas_object_smart_callback_add(parent, "gadget_removed", _memusage_removed_cb, inst); - evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, sysinfo_memusage_remove, inst); + evas_object_smart_callback_add(parent, "gadget_created", + _memusage_created_cb, inst); + evas_object_smart_callback_add(parent, "gadget_removed", + _memusage_removed_cb, inst); + evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, + sysinfo_memusage_remove, inst); evas_object_show(inst->o_main); if (inst->cfg->id < 0) return inst->o_main; - sysinfo_instances = - eina_list_append(sysinfo_instances, inst); + sysinfo_instances = eina_list_append(sysinfo_instances, inst); return inst->o_main; } --
