summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2014-07-04 11:55:21 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2014-07-04 11:55:21 +0900
commite1c262f989b0e1a0433d31470aa96691a4de5c73 (patch)
treea6b4c4b567d7cdbc3fd30636f23114b60f6e4230
parenta3a41cec1d8bc28b7aed10038fdad598e88a3a50 (diff)
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.
-rw-r--r--src/lib/elm_toolbar.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 55ec9f82b..ea6758bf8 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,
2957} 2957}
2958 2958
2959EOLIAN static void 2959EOLIAN static void
2960_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) 2960_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)
2961{ 2961{
2962 if (sd->focused_item) 2962 if (sd->focused_item)
2963 { 2963 {
@@ -2966,6 +2966,8 @@ _elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_To
2966 elm_widget_focus_highlight_focus_part_geometry_get 2966 elm_widget_focus_highlight_focus_part_geometry_get
2967 (VIEW(sd->focused_item), x, y, w, h); 2967 (VIEW(sd->focused_item), x, y, w, h);
2968 } 2968 }
2969 else
2970 evas_object_geometry_get(obj, x, y, w, h);
2969} 2971}
2970 2972
2971EAPI Evas_Object * 2973EAPI Evas_Object *