ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=28e5b5e82b246c97521440a02be946e57ae2cd0e

commit 28e5b5e82b246c97521440a02be946e57ae2cd0e
Author: Andy Williams <[email protected]>
Date:   Fri Mar 10 22:16:03 2017 +0000

    luncher: update aspect ratio calculations
    
    @fix
---
 src/modules/luncher/bar.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 25aed7f..e4bd0b4 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -1071,15 +1071,13 @@ _bar_icon_resized(void *data, Evas_Object *obj 
EINA_UNUSED, const char *emission
      {
       case E_GADGET_SITE_ORIENT_VERTICAL:
         EINA_LIST_FOREACH(inst->icons, l, ic)
-          {
-             tot += ic->scale;
-          }
-        evas_object_size_hint_aspect_set(inst->o_main, 
EVAS_ASPECT_CONTROL_BOTH, 1, eina_list_count(inst->icons)+tot);
+          tot += ic->scale * 100;
+        evas_object_size_hint_aspect_set(inst->o_main, 
EVAS_ASPECT_CONTROL_BOTH, 100, tot);
         break;
       default:
         EINA_LIST_FOREACH(inst->icons, l, ic)
-          tot += (ic->scale - 1.0);
-        evas_object_size_hint_aspect_set(inst->o_main, 
EVAS_ASPECT_CONTROL_BOTH, ceil(eina_list_count(inst->icons)+tot), 1);
+          tot += ic->scale * 100;
+        evas_object_size_hint_aspect_set(inst->o_main, 
EVAS_ASPECT_CONTROL_BOTH, tot, 100);
      }
 }
 
@@ -1097,7 +1095,7 @@ _bar_icon_scale_message(void *data, Evas_Object *obj 
EINA_UNUSED, Edje_Message_T
    if (ic->scale > 1.0)
      {
         total = (ic->inst->size * ic->scale) - ic->inst->size;
-        add = ceil(ceil(total)/2);
+        add = ceil(total/2.0);
         switch (e_gadget_site_orient_get(e_gadget_site_get(ic->inst->o_main)))
           {
              case E_GADGET_SITE_ORIENT_VERTICAL:

-- 


Reply via email to