summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2013-11-21 10:13:40 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2013-11-21 10:13:40 +0900
commit0a3f2f0e315789bd5be87d2205c306b20f660bc2 (patch)
tree3e636d54cd56c305c02fc9659bf5be543c4a1b88 /src
parent3d2e5d44aa4edc1675914b546535d44311cc22ae (diff)
elementary/elm_scroller.c : For checking focus next object, focus_direcion_get function should be changed to focus_next_get function. If there is no focus next object, focus_direction_get will be executed by focus_next_get.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elm_scroller.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 67ae134b1..b3082d9f4 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -151,31 +151,22 @@ _elm_scroller_smart_event(Eo *obj, void *_pd, va_list *list)
151 } 151 }
152 else 152 else
153 { 153 {
154 Evas_Object *tmp = NULL; 154 Eina_Bool r = EINA_FALSE;
155 double degree = 0.0, weight = 0.0;
156 void *(*list_data_get)(const Eina_List *list);
157
158 list_data_get = eina_list_data_get;
159 155
160 if ((!strcmp(ev->key, "Left")) || 156 if ((!strcmp(ev->key, "Left")) ||
161 (!strcmp(ev->key, "KP_Left"))) 157 (!strcmp(ev->key, "KP_Left")))
162 degree = 270.0; 158 r = elm_widget_focus_next_get(obj, ELM_FOCUS_LEFT, &new_focus);
163 else if ((!strcmp(ev->key, "Right")) || 159 else if ((!strcmp(ev->key, "Right")) ||
164 (!strcmp(ev->key, "KP_Right"))) 160 (!strcmp(ev->key, "KP_Right")))
165 degree = 90.0; 161 r = elm_widget_focus_next_get(obj, ELM_FOCUS_RIGHT, &new_focus);
166 else if ((!strcmp(ev->key, "Up")) || 162 else if ((!strcmp(ev->key, "Up")) ||
167 (!strcmp(ev->key, "KP_Up"))) 163 (!strcmp(ev->key, "KP_Up")))
168 degree = 0.0; 164 r = elm_widget_focus_next_get(obj, ELM_FOCUS_UP, &new_focus);
169 else if ((!strcmp(ev->key, "Down")) || 165 else if ((!strcmp(ev->key, "Down")) ||
170 (!strcmp(ev->key, "KP_Down"))) 166 (!strcmp(ev->key, "KP_Down")))
171 degree = 180.0; 167 r = elm_widget_focus_next_get(obj, ELM_FOCUS_DOWN, &new_focus);
172
173 if (elm_widget_focus_list_direction_get
174 (obj, current_focus, can_focus_list, list_data_get, degree,
175 &tmp, &weight))
176 new_focus = tmp;
177 168
178 if (new_focus) 169 if (r && new_focus)
179 { 170 {
180 Evas_Coord l_x = 0; 171 Evas_Coord l_x = 0;
181 Evas_Coord l_y = 0; 172 Evas_Coord l_y = 0;