woohyun pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=e1c262f989b0e1a0433d31470aa96691a4de5c73

commit e1c262f989b0e1a0433d31470aa96691a4de5c73
Author: WooHyun Jung <wh0705.j...@samsung.com>
Date:   Fri Jul 4 11:55:21 2014 +0900

    toolbar: fix focus highlight bug in toolbar
    
    When getting focus_highlight geometry from toolbar, there can be a case
    that no item has focus. Then, geometry of toolbar should be refered.
---
 src/lib/elm_toolbar.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 55ec9f8..ea6758b 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2957,7 +2957,7 @@ _elm_toolbar_coordinates_adjust(Elm_Object_Item *it,
 }
 
 EOLIAN static void
-_elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, 
Elm_Toolbar_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord 
*h)
+_elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Toolbar_Data 
*sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
    if (sd->focused_item)
      {
@@ -2966,6 +2966,8 @@ _elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo 
*obj EINA_UNUSED, Elm_To
         elm_widget_focus_highlight_focus_part_geometry_get
            (VIEW(sd->focused_item), x, y, w, h);
      }
+   else
+     evas_object_geometry_get(obj, x, y, w, h);
 }
 
 EAPI Evas_Object *

-- 


Reply via email to