<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174925] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174925">174925</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 00:04:49 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Minibrowser : Add support for Case sensitive and word start search
https://bugs.webkit.org/show_bug.cgi?id=137023
Patch by Tanay C <tanay.c@samsung.com> on 2014-10-20
Reviewed by Gyuyoung Kim.
* MiniBrowser/efl/main.c: Added functionality to support case sensitive and word start search
(search_box_show): Modified.
(search_box_hide): Modified.
(on_search_field_activated): Modified.
(on_search_backward_button_clicked): Modified.
(on_search_forward_button_clicked): Modified.
(on_search_case_option_changed): Added.
(on_search_word_start_option_changed): Added.
(window_create): Modified.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsereflmainc">trunk/Tools/MiniBrowser/efl/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174924 => 174925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-21 06:12:54 UTC (rev 174924)
+++ trunk/Tools/ChangeLog 2014-10-21 07:04:49 UTC (rev 174925)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-10-20 Tanay C <tanay.c@samsung.com>
</span><span class="cx">
</span><ins>+ [EFL][WK2] Minibrowser : Add support for Case sensitive and word start search
+ https://bugs.webkit.org/show_bug.cgi?id=137023
+
+ Reviewed by Gyuyoung Kim.
+
+ * MiniBrowser/efl/main.c: Added functionality to support case sensitive and word start search
+ (search_box_show): Modified.
+ (search_box_hide): Modified.
+ (on_search_field_activated): Modified.
+ (on_search_backward_button_clicked): Modified.
+ (on_search_forward_button_clicked): Modified.
+ (on_search_case_option_changed): Added.
+ (on_search_word_start_option_changed): Added.
+ (window_create): Modified.
+
+2014-10-20 Tanay C <tanay.c@samsung.com>
+
</ins><span class="cx"> [GTK][Minibrowser] Escape key does not hide the search box
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137734
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (174924 => 174925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2014-10-21 06:12:54 UTC (rev 174924)
+++ trunk/Tools/MiniBrowser/efl/main.c 2014-10-21 07:04:49 UTC (rev 174925)
</span><span class="lines">@@ -32,8 +32,7 @@
</span><span class="cx"> static const int TOOL_BAR_BUTTON_SIZE = 32;
</span><span class="cx"> static const int SEARCH_FIELD_SIZE = 200;
</span><span class="cx"> static const int SEARCH_BUTTON_SIZE = 30;
</span><del>-static const int MAX_SEARCH_COUNT = 100;
-static const int DEFAULT_SEARCH_FLAGS = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_CASE_INSENSITIVE | EWK_FIND_OPTIONS_WRAP_AROUND;
</del><ins>+static const int MAX_SEARCH_COUNT = 1000;
</ins><span class="cx"> static const double TOOLTIP_DELAY_SECONDS = 1.0;
</span><span class="cx"> static const double LONGPRESS_INTERVAL_SECONDS = 1.5;
</span><span class="cx"> static const double LIST_ITEM_HEIGHT = 24.35;
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> static Eina_Bool longpress_enabled = EINA_FALSE;
</span><span class="cx"> static int window_width = 800;
</span><span class="cx"> static int window_height = 600;
</span><ins>+static int search_flags = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_WRAP_AROUND | EWK_FIND_OPTIONS_CASE_INSENSITIVE;
</ins><span class="cx"> /* Default value of device_pixel_ratio is '0' so that we don't set custom device
</span><span class="cx"> * scale factor unless it's required by the User. */
</span><span class="cx"> static double device_pixel_ratio = 0;
</span><span class="lines">@@ -115,6 +115,8 @@
</span><span class="cx"> Evas_Object *search_field_count;
</span><span class="cx"> Evas_Object *backward_button;
</span><span class="cx"> Evas_Object *forward_button;
</span><ins>+ Evas_Object *search_case_check_box;
+ Evas_Object *search_word_start_check_box;
</ins><span class="cx"> Evas_Object *close_button;
</span><span class="cx"> } search;
</span><span class="cx"> struct {
</span><span class="lines">@@ -417,6 +419,8 @@
</span><span class="cx"> evas_object_show(window->search.search_field_count);
</span><span class="cx"> evas_object_show(window->search.backward_button);
</span><span class="cx"> evas_object_show(window->search.forward_button);
</span><ins>+ evas_object_show(window->search.search_case_check_box);
+ evas_object_show(window->search.search_word_start_check_box);
</ins><span class="cx"> evas_object_show(window->search.close_button);
</span><span class="cx">
</span><span class="cx"> /* Grab focus from the view */
</span><span class="lines">@@ -435,6 +439,8 @@
</span><span class="cx"> evas_object_hide(window->search.search_field_count);
</span><span class="cx"> evas_object_hide(window->search.backward_button);
</span><span class="cx"> evas_object_hide(window->search.forward_button);
</span><ins>+ evas_object_hide(window->search.search_case_check_box);
+ evas_object_hide(window->search.search_word_start_check_box);
</ins><span class="cx"> evas_object_hide(window->search.close_button);
</span><span class="cx">
</span><span class="cx"> /* Give focus back to the view */
</span><span class="lines">@@ -1069,7 +1075,7 @@
</span><span class="cx">
</span><span class="cx"> const char *markup_text = elm_entry_entry_get(search_field);
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(markup_text);
</span><del>- ewk_view_text_find(window->ewk_view, text, DEFAULT_SEARCH_FLAGS, MAX_SEARCH_COUNT);
</del><ins>+ ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
</ins><span class="cx"> free(text);
</span><span class="cx">
</span><span class="cx"> /* Grab focus from the view */
</span><span class="lines">@@ -1119,7 +1125,7 @@
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><del>- ewk_view_text_find(window->ewk_view, text, DEFAULT_SEARCH_FLAGS | EWK_FIND_OPTIONS_BACKWARDS, MAX_SEARCH_COUNT);
</del><ins>+ ewk_view_text_find(window->ewk_view, text, search_flags | EWK_FIND_OPTIONS_BACKWARDS, MAX_SEARCH_COUNT);
</ins><span class="cx"> free(text);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1129,11 +1135,37 @@
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="cx">
</span><span class="cx"> char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
</span><del>- ewk_view_text_find(window->ewk_view, text, DEFAULT_SEARCH_FLAGS, MAX_SEARCH_COUNT);
</del><ins>+ ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
</ins><span class="cx"> free(text);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><ins>+on_search_case_option_changed(void *user_data, Evas_Object *search_case_check_box, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+ char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
+
+ /* Bit toggle the case sensitive flag */
+ search_flags = search_flags ^ EWK_FIND_OPTIONS_CASE_INSENSITIVE;
+
+ ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
+ free(text);
+}
+
+static void
+on_search_word_start_option_changed(void *user_data, Evas_Object *search_word_start_check_box, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+ char *text = elm_entry_markup_to_utf8(elm_entry_entry_get(window->search.search_field));
+
+ /* Bit toggle the word start flag */
+ search_flags = search_flags ^ EWK_FIND_OPTIONS_AT_WORD_STARTS;
+
+ ewk_view_text_find(window->ewk_view, text, search_flags, MAX_SEARCH_COUNT);
+ free(text);
+}
+
+static void
</ins><span class="cx"> on_search_close_button_clicked(void *user_data, Evas_Object *search_close_button, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -2115,6 +2147,18 @@
</span><span class="cx"> elm_entry_text_style_user_push(window->search.search_field_count, "DEFAULT='font_size=14'");
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.search_field_count);
</span><span class="cx">
</span><ins>+ /* Create Search Case Sensitive Option check box */
+ window->search.search_case_check_box = elm_check_add(window->elm_window);
+ elm_object_text_set(window->search.search_case_check_box, "Case Sensitive");
+ evas_object_smart_callback_add(window->search.search_case_check_box, "changed", on_search_case_option_changed, window);
+ elm_box_pack_end(window->search.search_bar, window->search.search_case_check_box);
+
+ /* Create Search Word Start Option check box */
+ window->search.search_word_start_check_box = elm_check_add(window->elm_window);
+ elm_object_text_set(window->search.search_word_start_check_box, "Only Word Start");
+ evas_object_smart_callback_add(window->search.search_word_start_check_box, "changed", on_search_word_start_option_changed, window);
+ elm_box_pack_end(window->search.search_bar, window->search.search_word_start_check_box);
+
</ins><span class="cx"> /* Create Search close button */
</span><span class="cx"> window->search.close_button = create_toolbar_button(window->elm_window, "close");
</span><span class="cx"> evas_object_smart_callback_add(window->search.close_button, "clicked", on_search_close_button_clicked, window);
</span></span></pre>
</div>
</div>
</body>
</html>