summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-05-07 01:08:04 -0400
committerzmike <michael.blumenkrantz@gmail.com>2014-05-07 01:08:04 -0400
commitb8549f3e83a8592145a50085182583adead2c74e (patch)
tree4063ea55d8707570dfffe7c17e0c38a050a79f2b /src/lib
parent377179bdaf84aa1a86621cdfa64ed43613ab9d45 (diff)
Revert "focus: Removed unused parameter from an internal focus function."
This reverts commit 5832b692aa5f68a2924bd7886390d489eb13aefb. broke build
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_gengrid.c19
-rw-r--r--src/lib/elm_genlist.c19
-rw-r--r--src/lib/elm_list.c19
-rw-r--r--src/lib/elm_toolbar.c25
-rw-r--r--src/lib/elm_widget.c5
-rw-r--r--src/lib/elm_widget.eo1
-rw-r--r--src/lib/elm_widget.h2
-rw-r--r--src/lib/elm_win.c4
8 files changed, 72 insertions, 22 deletions
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 38063bdfb..ccf3366dc 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -4276,16 +4276,27 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth)
4276} 4276}
4277 4277
4278EOLIAN static void 4278EOLIAN static void
4279_elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 4279_elm_gengrid_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Gengrid_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next)
4280{ 4280{
4281 Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0; 4281 Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
4282 4282
4283 evas_object_geometry_get(obj, &ox, &oy, &ow, &oh); 4283 evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
4284 4284
4285 if (sd->focused_item) 4285 if (is_next)
4286 {
4287 if (sd->focused_item)
4288 {
4289 evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
4290 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
4291 }
4292 }
4293 else
4286 { 4294 {
4287 evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h); 4295 if (sd->prev_focused_item)
4288 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h); 4296 {
4297 evas_object_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
4298 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
4299 }
4289 } 4300 }
4290 4301
4291 *x = item_x; 4302 *x = item_x;
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 656744820..ce5b94c94 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -7418,16 +7418,27 @@ elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth)
7418} 7418}
7419 7419
7420EOLIAN static void 7420EOLIAN static void
7421_elm_genlist_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 7421_elm_genlist_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next)
7422{ 7422{
7423 Evas_Coord ox, oy, oh, item_x = 0, item_y = 0, item_w = 0, item_h = 0; 7423 Evas_Coord ox, oy, oh, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
7424 7424
7425 evas_object_geometry_get(obj, &ox, &oy, NULL, &oh); 7425 evas_object_geometry_get(obj, &ox, &oy, NULL, &oh);
7426 7426
7427 if (sd->focused_item) 7427 if (is_next)
7428 {
7429 if (sd->focused_item)
7430 {
7431 evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
7432 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
7433 }
7434 }
7435 else
7428 { 7436 {
7429 evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h); 7437 if (sd->prev_focused_item)
7430 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h); 7438 {
7439 evas_object_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
7440 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
7441 }
7431 } 7442 }
7432 7443
7433 if (item_y < oy) 7444 if (item_y < oy)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 050897871..d4f1aa54c 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2877,12 +2877,23 @@ _elm_list_item_coordinates_adjust(Elm_List_Item *it,
2877} 2877}
2878 2878
2879EOLIAN static void 2879EOLIAN static void
2880_elm_list_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 2880_elm_list_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_List_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next)
2881{ 2881{
2882 if (sd->focused_item) 2882 if (is_next)
2883 { 2883 {
2884 _elm_list_item_coordinates_adjust((Elm_List_Item *)sd->focused_item, x, y, w, h); 2884 if (sd->focused_item)
2885 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), x, y, w, h); 2885 {
2886 _elm_list_item_coordinates_adjust((Elm_List_Item *)sd->focused_item, x, y, w, h);
2887 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), x, y, w, h);
2888 }
2889 }
2890 else
2891 {
2892 if (sd->prev_focused_item)
2893 {
2894 _elm_list_item_coordinates_adjust((Elm_List_Item *)sd->prev_focused_item, x, y, w, h);
2895 elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), x, y, w, h);
2896 }
2886 } 2897 }
2887} 2898}
2888 2899
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 0a62fe1f6..347b4629b 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2937,14 +2937,27 @@ _elm_toolbar_coordinates_adjust(Elm_Toolbar_Item *it,
2937} 2937}
2938 2938
2939EOLIAN static void 2939EOLIAN static void
2940_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) 2940_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, Eina_Bool is_next)
2941{ 2941{
2942 if (sd->focused_item) 2942 if (is_next)
2943 { 2943 {
2944 _elm_toolbar_coordinates_adjust 2944 if (sd->focused_item)
2945 (sd->focused_item, x, y, w, h); 2945 {
2946 elm_widget_focus_highlight_focus_part_geometry_get 2946 _elm_toolbar_coordinates_adjust
2947 (VIEW(sd->focused_item), x, y, w, h); 2947 (sd->focused_item, x, y, w, h);
2948 elm_widget_focus_highlight_focus_part_geometry_get
2949 (VIEW(sd->focused_item), x, y, w, h);
2950 }
2951 }
2952 else
2953 {
2954 if (sd->prev_focused_item)
2955 {
2956 _elm_toolbar_coordinates_adjust
2957 (sd->prev_focused_item, x, y, w, h);
2958 elm_widget_focus_highlight_focus_part_geometry_get
2959 (VIEW(sd->prev_focused_item), x, y, w, h);
2960 }
2948 } 2961 }
2949} 2962}
2950 2963
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 25e6be290..b5d53362e 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -3762,8 +3762,11 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
3762} 3762}
3763 3763
3764EOLIAN static void 3764EOLIAN static void
3765_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 3765_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next)
3766{ 3766{
3767 (void)is_next;
3768
3769
3767 evas_object_geometry_get(obj, x, y, w, h); 3770 evas_object_geometry_get(obj, x, y, w, h);
3768 elm_widget_focus_highlight_focus_part_geometry_get(sd->resize_obj, x, y, w, h); 3771 elm_widget_focus_highlight_focus_part_geometry_get(sd->resize_obj, x, y, w, h);
3769} 3772}
diff --git a/src/lib/elm_widget.eo b/src/lib/elm_widget.eo
index 9efcf2151..8eb1d44e8 100644
--- a/src/lib/elm_widget.eo
+++ b/src/lib/elm_widget.eo
@@ -496,6 +496,7 @@ abstract Elm_Widget (Evas_Smart, Elm_Interface_Atspi_Widget)
496 @in Evas_Coord *y; 496 @in Evas_Coord *y;
497 @in Evas_Coord *w; 497 @in Evas_Coord *w;
498 @in Evas_Coord *h; 498 @in Evas_Coord *h;
499 @in Eina_Bool is_next;
499 } 500 }
500 } 501 }
501 activate { 502 activate {
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index ab8657006..043e45ec6 100644
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -755,7 +755,7 @@ EAPI void elm_widget_orientation_set(Evas_Object *obj, int rotation)
755EAPI Elm_Object_Item *elm_widget_focused_item_get(const Evas_Object *obj); 755EAPI Elm_Object_Item *elm_widget_focused_item_get(const Evas_Object *obj);
756EAPI void elm_widget_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled); 756EAPI void elm_widget_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled);
757EAPI Eina_Bool elm_widget_orientation_mode_disabled_get(const Evas_Object *obj); 757EAPI Eina_Bool elm_widget_orientation_mode_disabled_get(const Evas_Object *obj);
758EAPI void elm_widget_focus_highlight_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h); 758EAPI void elm_widget_focus_highlight_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h, Eina_Bool is_next);
759EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size); 759EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size);
760EAPI void _elm_widget_item_free(Elm_Widget_Item *item); 760EAPI void _elm_widget_item_free(Elm_Widget_Item *item);
761EAPI Evas_Object *_elm_widget_item_widget_get(const Elm_Widget_Item *item); 761EAPI Evas_Object *_elm_widget_item_widget_get(const Elm_Widget_Item *item);
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index aa80b2b93..e34fecfdd 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -762,7 +762,7 @@ _elm_win_focus_highlight_anim_setup(Elm_Win_Data *sd,
762 Evas_Object *target = sd->focus_highlight.cur.target; 762 Evas_Object *target = sd->focus_highlight.cur.target;
763 763
764 evas_object_geometry_get(obj, &px, &py, &pw, &ph); 764 evas_object_geometry_get(obj, &px, &py, &pw, &ph);
765 elm_widget_focus_highlight_geometry_get(target, &tx, &ty, &tw, &th); 765 elm_widget_focus_highlight_geometry_get(target, &tx, &ty, &tw, &th, EINA_TRUE);
766 evas_object_move(obj, tx, ty); 766 evas_object_move(obj, tx, ty);
767 evas_object_resize(obj, tw, th); 767 evas_object_resize(obj, tw, th);
768 768
@@ -791,7 +791,7 @@ _elm_win_focus_highlight_simple_setup(Elm_Win_Data *sd,
791 Evas_Object *clip, *target = sd->focus_highlight.cur.target; 791 Evas_Object *clip, *target = sd->focus_highlight.cur.target;
792 Evas_Coord x, y, w, h; 792 Evas_Coord x, y, w, h;
793 793
794 elm_widget_focus_highlight_geometry_get(target, &x, &y, &w, &h); 794 elm_widget_focus_highlight_geometry_get(target, &x, &y, &w, &h, EINA_TRUE);
795 795
796 evas_object_move(obj, x, y); 796 evas_object_move(obj, x, y);
797 evas_object_resize(obj, w, h); 797 evas_object_resize(obj, w, h);