Attachment 171903 Details for Bug 100962 – Revised patch

[patch] Revised patch

100962_filepicker_modal.patch (text/plain), 2.53 KB, created by Chris Dumez on 2012-11-01 12:00:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Dumez

Created: 2012-11-01 12:00:36 PDT

Size: 2.53 KB

patch

obsolete

>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7510757..92cd921 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,19 @@
>+2012-11-01  Christophe Dumez  <christophe.dumez@intel.com>
>+
>+        [EFL][WK2] Make File Chooser dialog modal in MiniBrowser
>+        https://bugs.webkit.org/show_bug.cgi?id=100962
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make File Chooser dialog modal in MiniBrowser and make
>+        sure it is closed and freed when its parent window is
>+        closed.
>+
>+        * MiniBrowser/efl/main.c:
>+        (on_filepicker_parent_deletion):
>+        (on_filepicker_deletion):
>+        (on_file_chooser_request):
>+
> 2012-11-01  Adam Roben  <aroben@webkit.org>
> 
>         Crash beneath WKRelease after failed load in MiniBrowser
>diff --git a/Tools/MiniBrowser/efl/main.c b/Tools/MiniBrowser/efl/main.c
>index 0e2ea2f..261389d 100644
>--- a/Tools/MiniBrowser/efl/main.c
>+++ b/Tools/MiniBrowser/efl/main.c
>@@ -321,6 +321,12 @@ static void close_file_picker(FileSelectorData* fs_data)
> }
> 
> static void
>+on_filepicker_parent_deletion(void *user_data, Evas *evas, Evas_Object *window, void *event)
>+{
>+    close_file_picker((FileSelectorData *)user_data);
>+}
>+
>+static void
> on_filepicker_deletion(void *user_data, Evas_Object *window, void *event_info)
> {
>     close_file_picker((FileSelectorData *)user_data);
>@@ -341,16 +347,20 @@ on_fileselector_done(void *user_data, Evas_Object *file_selector, void *event_in
> static void
> on_file_chooser_request(void *user_data, Evas_Object *webview, void *event_info)
> {
>+    Browser_Window *app_data = (Browser_Window *)user_data;
>     Ewk_File_Chooser_Request *request = (Ewk_File_Chooser_Request *)event_info;
> 
>     // Show basic file picker which does not currently support multiple files
>     // or MIME type filtering.
>-    Evas_Object *window = elm_win_util_standard_add("file-picker-window", "File picker");
>+    Evas_Object *window = elm_win_add(app_data->window, "file-picker-window", ELM_WIN_DIALOG_BASIC);
>+    elm_win_title_set(window, "File picker");
>+    elm_win_modal_set(window, EINA_TRUE);
> 
>     FileSelectorData* fs_data = (FileSelectorData*)malloc(sizeof(FileSelectorData));
>     fs_data->window = window;
>     fs_data->request = ewk_file_chooser_request_ref(request);
>     evas_object_smart_callback_add(window, "delete,request", on_filepicker_deletion, fs_data);
>+    evas_object_event_callback_add(app_data->window, EVAS_CALLBACK_DEL, on_filepicker_parent_deletion, fs_data);
> 
>     Evas_Object *file_selector = elm_fileselector_add(window);
>     const char *home_path = getenv("HOME");

Actions: View | Formatted Diff | Diff

Attachments on bug 100962: 171867 | 171903 | 171909