vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu + mem gadget: use new vertical layouts

This commit is contained in:
Davide Andreoli 2017-01-09 21:01:28 +01:00
parent 483a978e83
commit 409230ee35
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/sysinfo/cpumonitor/cpumonitor.c
View File

@ -61,10 +61,15 @@ Evas_Object *
_cpumonitor_add_layout(Instance *inst)
{
Evas_Object *layout;
int orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
layout = elm_layout_add(inst->cfg->cpumonitor.o_gadget);
e_theme_edje_object_set(layout, "base/theme/modules/cpumonitor",
"e/modules/cpumonitor/main");
if (orient == E_GADGET_SITE_ORIENT_VERTICAL)
e_theme_edje_object_set(layout, "base/theme/modules/cpumonitor",
"e/modules/cpumonitor/main_vert");
else
e_theme_edje_object_set(layout, "base/theme/modules/cpumonitor",
"e/modules/cpumonitor/main");
E_EXPAND(layout);
E_FILL(layout);
elm_box_pack_end(inst->cfg->cpumonitor.o_gadget, layout);
@ -174,6 +179,7 @@ _cpumonitor_eval_instance_aspect(Instance *inst)
switch (e_gadget_site_orient_get(owner))
{
case E_GADGET_SITE_ORIENT_HORIZONTAL:
case E_GADGET_SITE_ORIENT_NONE:
evas_object_geometry_get(owner, NULL, NULL, NULL, &sh);
break;
@ -181,10 +187,6 @@ _cpumonitor_eval_instance_aspect(Instance *inst)
evas_object_geometry_get(owner, NULL, NULL, &sw, NULL);
break;
case E_GADGET_SITE_ORIENT_NONE:
evas_object_geometry_get(owner, NULL, NULL, NULL, &sh);
break;
default:
sw = sh = 48;
break;
@ -205,9 +207,13 @@ static void
_cpumonitor_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED)
{
Instance *inst = data;
int orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
inst->cfg->cpumonitor.o_gadget = elm_box_add(inst->o_main);
elm_box_horizontal_set(inst->cfg->cpumonitor.o_gadget, EINA_TRUE);
if (orient == E_GADGET_SITE_ORIENT_VERTICAL)
elm_box_horizontal_set(inst->cfg->cpumonitor.o_gadget, EINA_FALSE);
else
elm_box_horizontal_set(inst->cfg->cpumonitor.o_gadget, EINA_TRUE);
E_EXPAND(inst->cfg->cpumonitor.o_gadget);
E_FILL(inst->cfg->cpumonitor.o_gadget);
elm_box_pack_end(inst->o_main, inst->cfg->cpumonitor.o_gadget);

19
src/modules/sysinfo/memusage/memusage.c
View File

@ -120,9 +120,11 @@ _memusage_eval_instance_aspect(Instance *inst)
owner = e_gadget_site_get(inst->o_main);
if (!owner)
return;
switch (e_gadget_site_orient_get(owner))
{
case E_GADGET_SITE_ORIENT_HORIZONTAL:
case E_GADGET_SITE_ORIENT_NONE:
evas_object_geometry_get(owner, NULL, NULL, NULL, &sh);
sw = sh;
break;
@ -132,11 +134,6 @@ _memusage_eval_instance_aspect(Instance *inst)
sh = sw;
break;
case E_GADGET_SITE_ORIENT_NONE:
evas_object_geometry_get(owner, NULL, NULL, NULL, &sh);
sw = sh;
break;
default:
sw = sh = 48;
break;
@ -152,10 +149,18 @@ static void
_memusage_created_cb(void *data, Evas_Object *obj, void *event_data EINA_UNUSED)
{
Instance *inst = data;
int orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
inst->cfg->memusage.o_gadget = elm_layout_add(inst->o_main);
e_theme_edje_object_set(inst->cfg->memusage.o_gadget, "base/theme/modules/memusage",
"e/modules/memusage/main");
if (orient == E_GADGET_SITE_ORIENT_VERTICAL)
e_theme_edje_object_set(inst->cfg->memusage.o_gadget,
"base/theme/modules/memusage",
"e/modules/memusage/main_vert");
else
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);
elm_box_pack_end(inst->o_main, inst->cfg->memusage.o_gadget);