From ad46d041a8614b9383e797b679c60ca2ded5354c Mon Sep 17 00:00:00 2001 From: Stephen 'Okra' Houston Date: Wed, 23 Aug 2017 09:55:59 -0500 Subject: [PATCH] Gadgets: Don't set gadgets to expand. --- src/modules/backlight/gadget/backlight.c | 3 --- src/modules/mixer/gadget/mixer.c | 2 -- src/modules/sysinfo/batman/batman.c | 1 - src/modules/sysinfo/cpuclock/cpuclock.c | 1 - src/modules/sysinfo/cpumonitor/cpumonitor.c | 1 - src/modules/sysinfo/memusage/memusage.c | 1 - src/modules/sysinfo/netstatus/netstatus.c | 1 - src/modules/sysinfo/thermal/thermal.c | 1 - src/modules/xkbswitch/gadget/xkbswitch.c | 2 -- 9 files changed, 13 deletions(-) diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c index 8e31c410a..d4aa7e7b0 100644 --- a/src/modules/backlight/gadget/backlight.c +++ b/src/modules/backlight/gadget/backlight.c @@ -278,9 +278,6 @@ backlight_gadget_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orien backlight_init(); else inst->val = -1.0; - - E_EXPAND(inst->o_main); - E_FILL(inst->o_main); evas_object_smart_callback_add(parent, "gadget_created", _backlight_gadget_created_cb, inst); if (*id != -1) { diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c index 7fb14e559..8f7fc64c5 100644 --- a/src/modules/mixer/gadget/mixer.c +++ b/src/modules/mixer/gadget/mixer.c @@ -672,8 +672,6 @@ mixer_gadget_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient) inst->o_main = elm_box_add(parent); inst->orient = orient; inst->id = *id; - E_EXPAND(inst->o_main); - E_FILL(inst->o_main); evas_object_show(inst->o_main); evas_object_smart_callback_add(parent, "gadget_created", _mixer_gadget_created_cb, inst); diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c index fcfedec0b..328d089f0 100644 --- a/src/modules/sysinfo/batman/batman.c +++ b/src/modules/sysinfo/batman/batman.c @@ -742,7 +742,6 @@ batman_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UNU inst->cfg = _conf_item_get(id); *id = inst->cfg->id; 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", _batman_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _batman_removed_cb, inst); diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index f6000c98b..333d170e8 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -1152,7 +1152,6 @@ cpuclock_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_U inst->cfg = _conf_item_get(id); *id = inst->cfg->id; 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", _cpuclock_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _cpuclock_removed_cb, inst); diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c index a4f13ff94..db22514fa 100644 --- a/src/modules/sysinfo/cpumonitor/cpumonitor.c +++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c @@ -499,7 +499,6 @@ cpumonitor_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA inst->cfg->cpumonitor.popup = NULL; inst->cfg->cpumonitor.configure = NULL; 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", _cpumonitor_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _cpumonitor_removed_cb, inst); diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c index e246fced2..310c736d8 100644 --- a/src/modules/sysinfo/memusage/memusage.c +++ b/src/modules/sysinfo/memusage/memusage.c @@ -569,7 +569,6 @@ memusage_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_U inst->cfg->memusage.popup = NULL; inst->cfg->memusage.configure = NULL; 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); diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c index ac4259d07..5a3c8eb9d 100644 --- a/src/modules/sysinfo/netstatus/netstatus.c +++ b/src/modules/sysinfo/netstatus/netstatus.c @@ -436,7 +436,6 @@ netstatus_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_ inst->cfg->netstatus.outstring = NULL; inst->cfg->netstatus.popup = NULL; 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", _netstatus_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _netstatus_removed_cb, inst); diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c index a63e8a999..884f058cc 100644 --- a/src/modules/sysinfo/thermal/thermal.c +++ b/src/modules/sysinfo/thermal/thermal.c @@ -478,7 +478,6 @@ thermal_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient EINA_UN inst->cfg = _conf_item_get(id); *id = inst->cfg->id; 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", _thermal_created_cb, inst); evas_object_smart_callback_add(parent, "gadget_removed", _thermal_removed_cb, inst); diff --git a/src/modules/xkbswitch/gadget/xkbswitch.c b/src/modules/xkbswitch/gadget/xkbswitch.c index 8ebcb2bbe..d89988f8c 100644 --- a/src/modules/xkbswitch/gadget/xkbswitch.c +++ b/src/modules/xkbswitch/gadget/xkbswitch.c @@ -282,8 +282,6 @@ xkbg_gadget_create(Evas_Object *parent, int *id EINA_UNUSED, E_Gadget_Site_Orien inst = E_NEW(Instance, 1); inst->o_main = elm_box_add(parent); inst->orient = orient; - E_EXPAND(inst->o_main); - E_FILL(inst->o_main); evas_object_smart_callback_add(parent, "gadget_created", _xkbg_gadget_created_cb, inst); evas_object_event_callback_add(inst->o_main, EVAS_CALLBACK_DEL, xkbg_del, inst);