From 994b854c97a6d3b8c6724679a0dd1d04fa3d15fc Mon Sep 17 00:00:00 2001
From: Tiago Rezende Campos Falcao <developer@tiagofalcao.com>
Date: Thu, 9 Dec 2010 13:07:39 +0000
Subject: [PATCH] Replace focus_jump by focus_cycle in disabled_set

elm_widget_disabled_set was calling focus_jump and it broke the focus tree.
Now, using focus_cycle to pass focus to next object.

Added test to disable focused button in test_focus.

SVN revision: 55408
---
 src/bin/test_focus.c | 32 +++++++++++++++++++++++++++++---
 src/lib/elm_widget.c |  3 ++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index f9172c4..7227d6d 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -29,6 +29,20 @@ _on_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
    //       obj, event->keyname, evas_object_smart_parent_get(obj));
 }
 
+static void
+_disable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *bt = data;
+   elm_object_disabled_set(bt, EINA_TRUE);
+}
+
+static void
+_enable(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *bt = data;
+   elm_object_disabled_set(bt, EINA_FALSE);
+}
+
 static inline void
 my_show(Evas_Object *obj)
 {
@@ -257,7 +271,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
                   elm_box_pack_end(bx2, bt);
                   my_show(bt);
-                  elm_object_focus_custom_chain_append(bx2, bt, NULL);
+                  elm_object_focus_custom_chain_prepend(bx2, bt, NULL);
                }
           }
 
@@ -269,18 +283,30 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              elm_layout_content_set(ly, "element2", bx2);
              my_show(bx2);
 
-             for (i = 3; i; i--)
                {
                   Evas_Object *bt;
                   bt = elm_button_add(win);
-                  elm_button_label_set(bt, "Box inside Layout");
+                  elm_button_label_set(bt, "Disable");
                   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
                   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
                   elm_box_pack_end(bx2, bt);
+                  evas_object_smart_callback_add(bt, "clicked", _disable, bt);
                   my_show(bt);
                   elm_object_focus_custom_chain_prepend(bx2, bt, NULL);
+
+                  Evas_Object *bt2;
+                  bt2 = elm_button_add(win);
+                  elm_button_label_set(bt2, "Enable");
+                  evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL,
+                                                  EVAS_HINT_FILL);
+                  evas_object_size_hint_weight_set(bt2, 0.0, 0.0);
+                  elm_box_pack_end(bx2, bt2);
+                  evas_object_smart_callback_add(bt2, "clicked", _enable, bt);
+                  my_show(bt2);
+                  elm_object_focus_custom_chain_append(bx2, bt2, NULL);
                }
+
           }
      }
 
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 6fae388..1fa4011 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -1704,7 +1704,8 @@ elm_widget_disabled_set(Evas_Object *obj, int disabled)
 	     if (!o) break;
 	     parent = o;
 	  }
-	elm_widget_focus_jump(parent, 1);
+        if (elm_widget_focus_get(obj))
+          elm_widget_focus_cycle(parent, ELM_FOCUS_NEXT);
      }
    if (sd->disable_func) sd->disable_func(obj);
 }
-- 
2.7.4