diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-11-12 22:47:16 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-11-12 22:47:16 +0000 |
| commit | 1b02c4c6ab57d6f211292f6ee4ab7a75e0420793 (patch) | |
| tree | 34a3507b3e18b26dca520683dbf82e275097ca2a | |
| parent | fc5ec2b00c102f8bd667346151b3206c5e140ebb (diff) | |
| download | enlightenment-1b02c4c6ab57d6f211292f6ee4ab7a75e0420793.tar.gz | |
connman gadget popup - fix sizing to scale better
| -rw-r--r-- | src/modules/connman/e_mod_main.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 67c0a339c2..4f700363e3 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -230,17 +230,18 @@ _e_connman_widget_size_set(E_Connman_Instance *inst, Evas_Object *widget, Evas_C zone = e_gadcon_client_zone_get(inst->gcc); e_zone_useful_geometry_get(zone, NULL, NULL, &zw, &zh); - w = zw * percent_w / 100.0; - h = zh * percent_h / 100.0; - - if (w < min_w) - w = min_w; - else if (w > max_w) - w = max_w; - if (h < min_h) - h = min_h; - else if (h > max_h) - h = max_h; + w = (zw * percent_w) / 100.0; + h = (zh * percent_h) / 100.0; + + min_w *= elm_config_scale_get(); + max_w *= elm_config_scale_get(); + min_h *= elm_config_scale_get(); + max_h *= elm_config_scale_get(); + + if (w < min_w) w = min_w; + else if (w > max_w) w = max_w; + if (h < min_h) h = min_h; + else if (h > max_h) h = max_h; e_widget_size_min_set(widget, w, h); } @@ -297,7 +298,7 @@ _econnman_popup_new(E_Connman_Instance *inst) } /* 30,40 % -- min vga, max uvga */ - _e_connman_widget_size_set(inst, list, 10, 30, 192, 192, 384, 384); + _e_connman_widget_size_set(inst, list, 10, 30, 192, 240, 360, 400); e_gadcon_popup_content_set(inst->popup, list); e_comp_object_util_autoclose(inst->popup->comp_object, _econnman_popup_del, NULL, inst); e_gadcon_popup_show(inst->popup); |