forked from enlightenment/efl
Revert "Revert "focus: Removed unused parameter from an internal focus function.""
This reverts commit b8549f3e83a8592145a50085182583adead2c74e. this build system is bad and whoever did the eo integration should not feel pleased with themselves.
This commit is contained in:
parent
54eabd94e2
commit
fe4fae4954
|
@ -4276,28 +4276,17 @@ elm_gengrid_nth_item_get(const Evas_Object *obj, unsigned int nth)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_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)
|
_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)
|
||||||
{
|
{
|
||||||
Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
|
Evas_Coord ox, oy, oh, ow, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
|
evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
|
||||||
|
|
||||||
if (is_next)
|
|
||||||
{
|
|
||||||
if (sd->focused_item)
|
if (sd->focused_item)
|
||||||
{
|
{
|
||||||
evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (sd->prev_focused_item)
|
|
||||||
{
|
|
||||||
evas_object_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
|
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
*x = item_x;
|
*x = item_x;
|
||||||
*y = item_y;
|
*y = item_y;
|
||||||
|
|
|
@ -7418,28 +7418,17 @@ elm_genlist_nth_item_get(const Evas_Object *obj, unsigned int nth)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_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)
|
_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)
|
||||||
{
|
{
|
||||||
Evas_Coord ox, oy, oh, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
|
Evas_Coord ox, oy, oh, item_x = 0, item_y = 0, item_w = 0, item_h = 0;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &ox, &oy, NULL, &oh);
|
evas_object_geometry_get(obj, &ox, &oy, NULL, &oh);
|
||||||
|
|
||||||
if (is_next)
|
|
||||||
{
|
|
||||||
if (sd->focused_item)
|
if (sd->focused_item)
|
||||||
{
|
{
|
||||||
evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
evas_object_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), &item_x, &item_y, &item_w, &item_h);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (sd->prev_focused_item)
|
|
||||||
{
|
|
||||||
evas_object_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
|
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), &item_x, &item_y, &item_w, &item_h);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (item_y < oy)
|
if (item_y < oy)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2877,24 +2877,13 @@ _elm_list_item_coordinates_adjust(Elm_List_Item *it,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_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)
|
_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)
|
||||||
{
|
{
|
||||||
if (is_next)
|
|
||||||
{
|
|
||||||
if (sd->focused_item)
|
if (sd->focused_item)
|
||||||
{
|
{
|
||||||
_elm_list_item_coordinates_adjust((Elm_List_Item *)sd->focused_item, x, y, w, h);
|
_elm_list_item_coordinates_adjust((Elm_List_Item *)sd->focused_item, x, y, w, h);
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), x, y, w, h);
|
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->focused_item), x, y, w, h);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (sd->prev_focused_item)
|
|
||||||
{
|
|
||||||
_elm_list_item_coordinates_adjust((Elm_List_Item *)sd->prev_focused_item, x, y, w, h);
|
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(VIEW(sd->prev_focused_item), x, y, w, h);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Elm_Object_Item*
|
EOLIAN static Elm_Object_Item*
|
||||||
|
|
|
@ -2937,10 +2937,8 @@ _elm_toolbar_coordinates_adjust(Elm_Toolbar_Item *it,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
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, Eina_Bool is_next)
|
_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)
|
||||||
{
|
{
|
||||||
if (is_next)
|
|
||||||
{
|
|
||||||
if (sd->focused_item)
|
if (sd->focused_item)
|
||||||
{
|
{
|
||||||
_elm_toolbar_coordinates_adjust
|
_elm_toolbar_coordinates_adjust
|
||||||
|
@ -2948,17 +2946,6 @@ _elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED, Elm_To
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get
|
elm_widget_focus_highlight_focus_part_geometry_get
|
||||||
(VIEW(sd->focused_item), x, y, w, h);
|
(VIEW(sd->focused_item), x, y, w, h);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (sd->prev_focused_item)
|
|
||||||
{
|
|
||||||
_elm_toolbar_coordinates_adjust
|
|
||||||
(sd->prev_focused_item, x, y, w, h);
|
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get
|
|
||||||
(VIEW(sd->prev_focused_item), x, y, w, h);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
|
|
|
@ -3762,11 +3762,8 @@ elm_widget_focus_highlight_focus_part_geometry_get(const Evas_Object *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_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)
|
_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)
|
||||||
{
|
{
|
||||||
(void)is_next;
|
|
||||||
|
|
||||||
|
|
||||||
evas_object_geometry_get(obj, x, y, w, h);
|
evas_object_geometry_get(obj, x, y, w, h);
|
||||||
elm_widget_focus_highlight_focus_part_geometry_get(sd->resize_obj, x, y, w, h);
|
elm_widget_focus_highlight_focus_part_geometry_get(sd->resize_obj, x, y, w, h);
|
||||||
}
|
}
|
||||||
|
|
|
@ -496,7 +496,6 @@ abstract Elm_Widget (Evas_Smart, Elm_Interface_Atspi_Widget)
|
||||||
@in Evas_Coord *y;
|
@in Evas_Coord *y;
|
||||||
@in Evas_Coord *w;
|
@in Evas_Coord *w;
|
||||||
@in Evas_Coord *h;
|
@in Evas_Coord *h;
|
||||||
@in Eina_Bool is_next;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
activate {
|
activate {
|
||||||
|
|
|
@ -755,7 +755,7 @@ EAPI void elm_widget_orientation_set(Evas_Object *obj, int rotation)
|
||||||
EAPI Elm_Object_Item *elm_widget_focused_item_get(const Evas_Object *obj);
|
EAPI Elm_Object_Item *elm_widget_focused_item_get(const Evas_Object *obj);
|
||||||
EAPI void elm_widget_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled);
|
EAPI void elm_widget_orientation_mode_disabled_set(Evas_Object *obj, Eina_Bool disabled);
|
||||||
EAPI Eina_Bool elm_widget_orientation_mode_disabled_get(const Evas_Object *obj);
|
EAPI Eina_Bool elm_widget_orientation_mode_disabled_get(const Evas_Object *obj);
|
||||||
EAPI 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);
|
EAPI void elm_widget_focus_highlight_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
|
||||||
EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size);
|
EAPI Elm_Widget_Item *_elm_widget_item_new(Evas_Object *parent, size_t alloc_size);
|
||||||
EAPI void _elm_widget_item_free(Elm_Widget_Item *item);
|
EAPI void _elm_widget_item_free(Elm_Widget_Item *item);
|
||||||
EAPI Evas_Object *_elm_widget_item_widget_get(const Elm_Widget_Item *item);
|
EAPI Evas_Object *_elm_widget_item_widget_get(const Elm_Widget_Item *item);
|
||||||
|
|
|
@ -762,7 +762,7 @@ _elm_win_focus_highlight_anim_setup(Elm_Win_Data *sd,
|
||||||
Evas_Object *target = sd->focus_highlight.cur.target;
|
Evas_Object *target = sd->focus_highlight.cur.target;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &px, &py, &pw, &ph);
|
evas_object_geometry_get(obj, &px, &py, &pw, &ph);
|
||||||
elm_widget_focus_highlight_geometry_get(target, &tx, &ty, &tw, &th, EINA_TRUE);
|
elm_widget_focus_highlight_geometry_get(target, &tx, &ty, &tw, &th);
|
||||||
evas_object_move(obj, tx, ty);
|
evas_object_move(obj, tx, ty);
|
||||||
evas_object_resize(obj, tw, th);
|
evas_object_resize(obj, tw, th);
|
||||||
|
|
||||||
|
@ -791,7 +791,7 @@ _elm_win_focus_highlight_simple_setup(Elm_Win_Data *sd,
|
||||||
Evas_Object *clip, *target = sd->focus_highlight.cur.target;
|
Evas_Object *clip, *target = sd->focus_highlight.cur.target;
|
||||||
Evas_Coord x, y, w, h;
|
Evas_Coord x, y, w, h;
|
||||||
|
|
||||||
elm_widget_focus_highlight_geometry_get(target, &x, &y, &w, &h, EINA_TRUE);
|
elm_widget_focus_highlight_geometry_get(target, &x, &y, &w, &h);
|
||||||
|
|
||||||
evas_object_move(obj, x, y);
|
evas_object_move(obj, x, y);
|
||||||
evas_object_resize(obj, w, h);
|
evas_object_resize(obj, w, h);
|
||||||
|
|
Loading…
Reference in New Issue