From 58643b42bfe7de579a731ef994597d12bc7a8863 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 4 Sep 2012 09:42:27 +0000 Subject: [PATCH] Elm: Fix toolbar widget to account for framespace. Fixes ticket 1418 where the 'more' button was showing the popup incorrectly. SVN revision: 76116 --- legacy/elementary/src/lib/elm_toolbar.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index 5e6f1bb39e..393a69395c 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -471,11 +471,14 @@ _resize_cb(void *data, void *event_info __UNUSED__) { Evas_Coord x, y, h; + Evas_Coord fy; ELM_TOOLBAR_DATA_GET(data, sd); + evas_output_framespace_get(evas_object_evas_get(data), + NULL, &fy, NULL, NULL); evas_object_geometry_get(data, &x, &y, NULL, &h); - evas_object_move(sd->more, x, y + h); + evas_object_move(sd->more, x, (y + h) - fy); if (!sd->resize_job) sd->resize_job = ecore_job_add(_resize_job, data); @@ -538,12 +541,12 @@ _menu_move_resize_cb(void *data, void *event_info __UNUSED__) { Elm_Toolbar_Item *it = data; - Evas_Coord x, y, w, h; + Evas_Coord x, y, h; ELM_TOOLBAR_DATA_GET(WIDGET(it), sd); if (!sd->menu_parent) return; - evas_object_geometry_get(VIEW(it), &x, &y, &w, &h); + evas_object_geometry_get(VIEW(it), &x, &y, NULL, &h); elm_menu_move(it->o_menu, x, y + h); }