summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_widget.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_widget.c')
-rw-r--r--src/lib/elementary/efl_ui_widget.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index d98ee78..010c9fa 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -21,10 +21,6 @@
21#include "elm_part_helper.h" 21#include "elm_part_helper.h"
22#include "elm_widget_combobox.h" 22#include "elm_widget_combobox.h"
23 23
24/* FIXME: remove this when we don't rely on evas event structs anymore */
25#define EFL_INTERNAL_UNSTABLE
26#include "interfaces/efl_common_internal.h"
27
28#define MY_CLASS EFL_UI_WIDGET_CLASS 24#define MY_CLASS EFL_UI_WIDGET_CLASS
29 25
30#define MY_CLASS_NAME "Efl_Ui_Widget" 26#define MY_CLASS_NAME "Efl_Ui_Widget"
@@ -1132,12 +1128,15 @@ elm_widget_focus_region_show(Eo *obj)
1132 if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o)) 1128 if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o))
1133 { 1129 {
1134 Evas_Coord sx, sy; 1130 Evas_Coord sx, sy;
1131 Evas_Coord vx, vy;
1132
1135 elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL); 1133 elm_interface_scrollable_content_region_get(o, &sx, &sy, NULL, NULL);
1134 elm_interface_scrollable_content_viewport_geometry_get(o, &vx, &vy, NULL, NULL);
1136 1135
1137 // Get the object's on_focus_region position relative to the scroller. 1136 // Get the object's on_focus_region position relative to the pan in the scroller.
1138 Evas_Coord rx, ry; 1137 Evas_Coord rx, ry;
1139 rx = ox + r.x - px + sx; 1138 rx = ox + r.x - vx + sx;
1140 ry = oy + r.y - py + sy; 1139 ry = oy + r.y - vy + sy;
1141 1140
1142 switch (_elm_config->focus_autoscroll_mode) 1141 switch (_elm_config->focus_autoscroll_mode)
1143 { 1142 {
@@ -1732,7 +1731,7 @@ elm_widget_tree_unfocusable_set(Eo *obj, Eina_Bool tree_unfocusable)
1732 Efl_Ui_Widget *subs; 1731 Efl_Ui_Widget *subs;
1733 Eina_List *n; 1732 Eina_List *n;
1734 Elm_Widget_Smart_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); 1733 Elm_Widget_Smart_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS);
1735 if (!pd) return; 1734 EINA_SAFETY_ON_NULL_RETURN(pd);
1736 int distance, parent_counter = (pd->parent_obj ? _tree_unfocusable_counter_get(pd->parent_obj) : 0); 1735 int distance, parent_counter = (pd->parent_obj ? _tree_unfocusable_counter_get(pd->parent_obj) : 0);
1737 1736
1738 if (tree_unfocusable) 1737 if (tree_unfocusable)
@@ -1772,7 +1771,7 @@ EAPI Eina_Bool
1772elm_widget_tree_unfocusable_get(const Eo *obj) 1771elm_widget_tree_unfocusable_get(const Eo *obj)
1773{ 1772{
1774 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS); 1773 Elm_Widget_Smart_Data *sd = efl_data_scope_safe_get(obj, MY_CLASS);
1775 if (!sd) return EINA_FALSE; 1774 EINA_SAFETY_ON_NULL_RETURN_VAL(sd, EINA_FALSE);
1776 1775
1777 return !!sd->tree_unfocusable; 1776 return !!sd->tree_unfocusable;
1778} 1777}
@@ -5985,7 +5984,7 @@ _efl_ui_property_bind(Eo *widget, Eo *target, Efl_Ui_Widget_Data *pd,
5985{ 5984{
5986 Efl_Ui_Property_Bound *prop; 5985 Efl_Ui_Property_Bound *prop;
5987 5986
5988 // Always check for a model and fetch a provider in case a binded property 5987 // Always check for a model and fetch a provider in case a bound property
5989 // is provided by a class down the hierarchy, but they still need to be notified 5988 // is provided by a class down the hierarchy, but they still need to be notified
5990 // when a model change 5989 // when a model change
5991 _efl_ui_widget_model_register(widget, pd); 5990 _efl_ui_widget_model_register(widget, pd);