win: Simplify modal legacy API and add test case

This fixes the modality of windows shown after setting
the flag.

2 files changed, 80 insertions, 0 deletions

diff --git a/src/bin/elementary/test.c b/src/bin/elementary/test.c
index a250762a82..5595d88b6c 100644
--- a/src/bin/elementary/test.c
+++ b/src/bin/elementary/test.c
@@ -283,6 +283,7 @@ void test_dnd_multi_features(void *data, Evas_Object *obj, void *event_info);
 void test_dnd_types(void *data, Evas_Object *obj, void *event_info);
 void test_task_switcher(void *data, Evas_Object *obj, void *event_info);
 void test_win_dialog(void *data, Evas_Object *obj, void *event_info);
+void test_win_modal(void *data, Evas_Object *obj, void *event_info);
 void test_box_disable(void *data, Evas_Object *obj, void *event_info);
 void test_layout_disable(void *data, Evas_Object *obj, void *event_info);
 
@@ -642,6 +643,7 @@ add_tests:
    ADD_TEST(NULL, "Window / Background", "Window WM Rotation", test_win_wm_rotation);
    ADD_TEST(NULL, "Window / Background", "Window Standard/Dialog", test_win_dialog);
    ADD_TEST(NULL, "Window / Background", "Window Keygrab Set", test_win_keygrab);
+   ADD_TEST(NULL, "Window / Background", "Window Modal", test_win_modal);
 
    //------------------------------//
    ADD_TEST(NULL, "Images", "Icon", test_icon);
diff --git a/src/bin/elementary/test_win_modal.c b/src/bin/elementary/test_win_modal.c
new file mode 100644
index 0000000000..b844b8a972
--- /dev/null
+++ b/src/bin/elementary/test_win_modal.c
@@ -0,0 +1,78 @@
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
+#include <Elementary.h>
+
+static Evas_Object *
+_parent_win_get(Evas_Object *obj)
+{
+   Evas_Object *parent = obj;
+
+   while ((parent = elm_object_parent_widget_get(obj)) != NULL)
+     obj = parent;
+
+   return obj;
+}
+
+static void
+_close(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Object *win = data;
+
+   evas_object_del(win);
+}
+
+void
+test_win_modal(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Evas_Object *parent_win, *win, *bg, *txt, *bx, *bt;
+
+   parent_win = _parent_win_get(obj);
+
+   win = elm_win_add(parent_win, "modal", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Window Modal");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   elm_win_resize_object_add(win, bx);
+   evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bx);
+
+   txt = elm_label_add(win);
+   elm_object_text_set(txt, "This is a modal window.<br>"
+                       "It will block all inputs on all the other opened windows.");
+   evas_object_size_hint_align_set(txt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(txt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_label_line_wrap_set(txt, ELM_WRAP_WORD);
+   elm_box_pack_end(bx, txt);
+   evas_object_show(txt);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Open another modal window");
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(bt, "clicked", test_win_modal, NULL);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Close");
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0);
+   evas_object_smart_callback_add(bt, "clicked", _close, win);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
+   /* make the window modal */
+   elm_win_modal_set(win, EINA_TRUE);
+
+   evas_object_resize(win, 250, 150);
+   evas_object_show(win);
+}