From 9894726039072ed4db69f7c82791dbd2b408f259 Mon Sep 17 00:00:00 2001
From: Stephen 'Okra' Houston <smhouston88@gmail.com>
Date: Thu, 6 Jul 2017 14:16:00 -0500
Subject: [PATCH] Gadgets: Clamp aspect sets to a minimum of width and height
 minimum of 1.

This fixes T5600
---
 src/modules/backlight/gadget/backlight.c    | 2 ++
 src/modules/mixer/gadget/mixer.c            | 2 ++
 src/modules/sysinfo/batman/batman.c         | 2 ++
 src/modules/sysinfo/cpuclock/cpuclock.c     | 2 ++
 src/modules/sysinfo/cpumonitor/cpumonitor.c | 2 ++
 src/modules/sysinfo/memusage/memusage.c     | 2 ++
 src/modules/sysinfo/netstatus/netstatus.c   | 2 ++
 src/modules/sysinfo/thermal/thermal.c       | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c
index 883801bc7..fafb2540e 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -224,6 +224,8 @@ _backlight_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_backlight), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
 }
 
diff --git a/src/modules/mixer/gadget/mixer.c b/src/modules/mixer/gadget/mixer.c
index 8e1583a27..c68c0e197 100644
--- a/src/modules/mixer/gadget/mixer.c
+++ b/src/modules/mixer/gadget/mixer.c
@@ -593,6 +593,8 @@ _mixer_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->o_mixer), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
 }
 
diff --git a/src/modules/sysinfo/batman/batman.c b/src/modules/sysinfo/batman/batman.c
index 00f04b22d..f44731a60 100644
--- a/src/modules/sysinfo/batman/batman.c
+++ b/src/modules/sysinfo/batman/batman.c
@@ -517,6 +517,8 @@ _batman_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->batman.o_gadget), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_BATMAN)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
    else
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c
index 25b821a4a..f2455fce7 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -689,6 +689,8 @@ _cpuclock_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->cpuclock.o_gadget), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_CPUCLOCK)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
    else
diff --git a/src/modules/sysinfo/cpumonitor/cpumonitor.c b/src/modules/sysinfo/cpumonitor/cpumonitor.c
index 760d931e1..2220ca40d 100644
--- a/src/modules/sysinfo/cpumonitor/cpumonitor.c
+++ b/src/modules/sysinfo/cpumonitor/cpumonitor.c
@@ -147,6 +147,8 @@ _cpumonitor_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *e
         w *= num_cores;
         h = sh;
      }
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_CPUMONITOR)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
    else
diff --git a/src/modules/sysinfo/memusage/memusage.c b/src/modules/sysinfo/memusage/memusage.c
index c590bb731..c36c10722 100644
--- a/src/modules/sysinfo/memusage/memusage.c
+++ b/src/modules/sysinfo/memusage/memusage.c
@@ -260,6 +260,8 @@ _memusage_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSE
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->memusage.o_gadget),
                                   0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_MEMUSAGE)
      evas_object_size_hint_aspect_set(inst->o_main,
                                       EVAS_ASPECT_CONTROL_BOTH, w, h);
diff --git a/src/modules/sysinfo/netstatus/netstatus.c b/src/modules/sysinfo/netstatus/netstatus.c
index 815b4b650..e16e2b1c3 100644
--- a/src/modules/sysinfo/netstatus/netstatus.c
+++ b/src/modules/sysinfo/netstatus/netstatus.c
@@ -115,6 +115,8 @@ _netstatus_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->netstatus.o_gadget), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_NETSTATUS)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
    else
diff --git a/src/modules/sysinfo/thermal/thermal.c b/src/modules/sysinfo/thermal/thermal.c
index 4e9aab006..2ee8a9c9f 100644
--- a/src/modules/sysinfo/thermal/thermal.c
+++ b/src/modules/sysinfo/thermal/thermal.c
@@ -190,6 +190,8 @@ _thermal_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED
    Instance *inst = data;
 
    edje_object_parts_extends_calc(elm_layout_edje_get(inst->cfg->thermal.o_gadget), 0, 0, &w, &h);
+   if (w < 1) w = 1;
+   if (h < 1) h = 1;
    if (inst->cfg->esm == E_SYSINFO_MODULE_THERMAL)
      evas_object_size_hint_aspect_set(inst->o_main, EVAS_ASPECT_CONTROL_BOTH, w, h);
    else