From 3c31e67b05b61259d18339e874fc70b69589ef5d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 18 Aug 2017 15:52:52 -0400 Subject: [PATCH] use menu item geometry to determine whether menu item is onscreen fix T2126 --- src/bin/e_menu.c | 5 +---- src/modules/conf_theme/e_int_config_color_classes.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 53ca49eab..47dd04a58 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -2549,10 +2549,7 @@ _e_menu_item_ensure_onscreen(E_Menu_Item *mi) if (!mi->menu) return; if (!mi->menu->zone) return; - x = mi->menu->cur.x; - y = mi->menu->cur.y; - w = mi->menu->cur.w; - h = mi->menu->cur.h; + evas_object_geometry_get(mi->container_object, &x, &y, &w, &h); if ((x + w) > (mi->menu->zone->x + mi->menu->zone->w)) dx = (mi->menu->zone->x + mi->menu->zone->w) - (x + w); else if (x < mi->menu->zone->x) diff --git a/src/modules/conf_theme/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c index 7486a1d6e..fcde5db71 100644 --- a/src/modules/conf_theme/e_int_config_color_classes.c +++ b/src/modules/conf_theme/e_int_config_color_classes.c @@ -32,7 +32,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dia e_dialog_resizable_set(cfd->dia, 1); o = elm_color_class_editor_add(cfd->dia->win); - evas_object_size_hint_min_set(o, 400, 280); + elm_win_resize_object_add(cfd->dia->win, o); e_util_win_auto_resize_fill(cfd->dia->win); elm_win_center(cfd->dia->win, 1, 1);