Changeset 170786 in webkit
- Timestamp:
- Jul 3, 2014 10:38:20 PM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r170774 r170786 1 2014-07-03 Shivakumar JM <shiva.jm@samsung.com> 2 3 [EFL][WK2] Enhance the Minibrowser to show text search count and close search bar. 4 https://bugs.webkit.org/show_bug.cgi?id=134486 5 6 Reviewed by Gyuyoung Kim. 7 8 Use on_search_close_button_clicked() callback to close search bar and on_search_text_found() callback to show search count. 9 10 * MiniBrowser/efl/main.c: 11 (search_box_show): 12 (search_box_hide): 13 (on_search_close_button_clicked): 14 (on_search_text_found): 15 (window_create): 16 1 17 2014-07-03 Daniel Bates <dabates@apple.com> 2 18 -
trunk/Tools/MiniBrowser/efl/main.c
r170349 r170786 32 32 static const int TOOL_BAR_BUTTON_SIZE = 32; 33 33 static const int SEARCH_FIELD_SIZE = 200; 34 static const int SEARCH_BUTTON_SIZE = 25;34 static const int SEARCH_BUTTON_SIZE = 30; 35 35 static const int MAX_SEARCH_COUNT = 100; 36 36 static const int DEFAULT_SEARCH_FLAGS = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_CASE_INSENSITIVE | EWK_FIND_OPTIONS_WRAP_AROUND; … … 109 109 Evas_Object *search_bar; 110 110 Evas_Object *search_field; 111 Evas_Object *search_field_count; 111 112 Evas_Object *backward_button; 112 113 Evas_Object *forward_button; 114 Evas_Object *close_button; 113 115 } search; 114 116 int current_zoom_level; … … 369 371 evas_object_show(window->search.search_bar); 370 372 evas_object_show(window->search.search_field); 373 evas_object_show(window->search.search_field_count); 371 374 evas_object_show(window->search.backward_button); 372 375 evas_object_show(window->search.forward_button); 376 evas_object_show(window->search.close_button); 373 377 374 378 /* Grab focus from the view */ … … 385 389 evas_object_hide(window->search.search_bar); 386 390 evas_object_hide(window->search.search_field); 391 evas_object_hide(window->search.search_field_count); 387 392 evas_object_hide(window->search.backward_button); 388 393 evas_object_hide(window->search.forward_button); 394 evas_object_hide(window->search.close_button); 389 395 390 396 /* Give focus back to the view */ … … 1017 1023 1018 1024 static void 1025 on_search_close_button_clicked(void *user_data, Evas_Object *search_close_button, void *event_info) 1026 { 1027 Browser_Window *window = (Browser_Window *)user_data; 1028 1029 search_box_hide(window); 1030 } 1031 1032 static void 1019 1033 on_refresh_button_clicked(void *user_data, Evas_Object *refresh_button, void *event_info) 1020 1034 { … … 1659 1673 1660 1674 static void 1675 on_search_text_found(void *user_data, Evas_Object *obj, void *event_info) 1676 { 1677 Browser_Window *window = (Browser_Window *)user_data; 1678 1679 const int *match_count = (const int *)(event_info); 1680 1681 if (*match_count) { 1682 Eina_Strbuf *search_text = eina_strbuf_new(); 1683 eina_strbuf_append_printf(search_text, " %d Matches Found " , *match_count); 1684 elm_object_text_set(window->search.search_field_count, eina_strbuf_string_get(search_text)); 1685 eina_strbuf_free(search_text); 1686 } else 1687 elm_object_text_set(window->search.search_field_count, " No Matches Found"); 1688 1689 evas_object_focus_set(window->ewk_view, EINA_FALSE); 1690 elm_object_focus_set(window->search.search_field_count, EINA_FALSE); 1691 elm_object_focus_set(window->search.search_field, EINA_TRUE); 1692 } 1693 1694 static void 1661 1695 on_tooltip_text_set(void *user_data, Evas_Object *obj, void *event_info) 1662 1696 { … … 1837 1871 evas_object_size_hint_min_set(window->search.forward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE); 1838 1872 elm_box_pack_end(window->search.search_bar, window->search.forward_button); 1873 1874 /* Create Search count field */ 1875 window->search.search_field_count = elm_label_add(window->elm_window); 1876 evas_object_size_hint_weight_set(window->search.search_field_count, 0.0, EVAS_HINT_EXPAND); 1877 evas_object_size_hint_align_set(window->search.search_field_count, EVAS_HINT_FILL, EVAS_HINT_FILL); 1878 elm_object_text_set(window->search.search_field_count, ""); 1879 elm_entry_text_style_user_push(window->search.search_field_count, "DEFAULT='font_size=14'"); 1880 elm_box_pack_end(window->search.search_bar, window->search.search_field_count); 1881 1882 /* Create Search close button */ 1883 window->search.close_button = create_toolbar_button(window->elm_window, "close"); 1884 evas_object_smart_callback_add(window->search.close_button, "clicked", on_search_close_button_clicked, window); 1885 elm_object_disabled_set(window->search.close_button, EINA_FALSE); 1886 evas_object_size_hint_weight_set(window->search.close_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1887 evas_object_size_hint_align_set(window->search.close_button, 1.0, 0.5); 1888 evas_object_size_hint_min_set(window->search.close_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE); 1889 elm_box_pack_end(window->search.search_bar, window->search.close_button); 1839 1890 1840 1891 /* Create ewk_view */ … … 1908 1959 evas_object_smart_callback_add(window->ewk_view, "url,changed", on_url_changed, window); 1909 1960 evas_object_smart_callback_add(window->ewk_view, "back,forward,list,changed", on_back_forward_list_changed, window); 1961 evas_object_smart_callback_add(window->ewk_view, "text,found", on_search_text_found, window); 1910 1962 evas_object_smart_callback_add(window->ewk_view, "tooltip,text,set", on_tooltip_text_set, window); 1911 1963 evas_object_smart_callback_add(window->ewk_view, "tooltip,text,unset", on_tooltip_text_unset, window);
Note: See TracChangeset
for help on using the changeset viewer.