hermet pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=800821735fc8b66f092964afa92a02294d8c869b

commit 800821735fc8b66f092964afa92a02294d8c869b
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Thu Nov 7 22:34:57 2013 +0900

    elementary/scroller - don't focus region show if the scroller is disabled.
---
 ChangeLog            | 4 ++++
 NEWS                 | 1 +
 src/lib/elm_widget.c | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 24ba4be..2e58ed5 100644
--- a/ChangeLog
+++ b/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/NEWS b/NEWS
index b7492b3..49d973a 100644
--- a/NEWS
+++ b/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/src/lib/elm_widget.c b/src/lib/elm_widget.c
index c96f110..271f779 100644
--- a/src/lib/elm_widget.c
+++ b/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));
 

-- 


Reply via email to