okra pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=30ee8c52849d469ebf955cb57329d1f5fe0b0ba9

commit 30ee8c52849d469ebf955cb57329d1f5fe0b0ba9
Author: Stephen 'Okra' Houston <[email protected]>
Date:   Thu Aug 24 08:06:20 2017 -0500

    CPUMonitor: Make sure to set the number of cores so aspect calcs.
---
 src/modules/sysinfo/cpumonitor/cpumonitor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c 
b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index d9e2fea81..9a1882c27 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -154,10 +154,9 @@ _cpumonitor_resize_cb(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj, void *e
      }
    if (w < 1) w = 1;
    if (h < 1) h = 1;
+   evas_object_size_hint_aspect_set(inst->cfg->cpumonitor.o_gadget_box, 
EVAS_ASPECT_CONTROL_BOTH, w, h);
    if (inst->cfg->esm == E_SYSINFO_MODULE_CPUMONITOR)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, 
w, h);
-   else
-     evas_object_size_hint_aspect_set(inst->cfg->cpumonitor.o_gadget, 
EVAS_ASPECT_CONTROL_BOTH, w, h);
 }
 
 static void
@@ -273,6 +272,8 @@ _cpumonitor_config_updated(Instance *inst)
              thc->total = 0;
              thc->idle = 0;
              thc->percent = 60;
+             thc->num_cores = 4;
+             inst->cfg->cpumonitor.cores = thc->num_cores;
              for (i = 0; i < 4; i++)
                {
                   core = E_NEW(CPU_Core, 1);
@@ -312,6 +313,7 @@ _cpumonitor_config_updated(Instance *inst)
 #else
         thc->num_cores = _cpumonitor_proc_getcores();
 #endif
+        inst->cfg->cpumonitor.cores = thc->num_cores;
         for (i = 0; i < thc->num_cores; i++)
           {
              core = E_NEW(CPU_Core, 1);

-- 


Reply via email to