diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 24ba4be56c..2e58ed5522 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1735,3 +1735,7 @@ 2013-11-03 Daniel Juyung Seo (SeoZ) * Genlist/Gengrid/List: Added multi select mode. + +2013-11-07 ChunEon Park (Hermet) + + * scroller: don't focus region show if the scroller is disabled. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index b7492b386d..49d973a644 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -307,6 +307,7 @@ Fixes: * elm_popup breaks theme due to poor namespacing * ctxpopup: fix elm_object_content_unset didn't unpack content from box * scroller : fix the scroller to locate the current page correctly in case that the scroller is suddenly resized and then the drag couldn't capture the page location. + * scroller: don't focus region show if the scroller is disabled. Removals: diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index c96f110ff5..271f7799d3 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -624,7 +624,7 @@ _elm_widget_focus_region_show(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA { Evas_Coord px, py; - if (_elm_scrollable_is(o)) + if (_elm_scrollable_is(o) && !elm_widget_disabled_get(o)) { eo_do(o, elm_scrollable_interface_content_region_show(x, y, w, h));