<!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>[170786] 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/170786">170786</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-03 22:38:20 -0700 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Enhance the Minibrowser to show text search count and close search bar.
https://bugs.webkit.org/show_bug.cgi?id=134486
Patch by Shivakumar JM <shiva.jm@samsung.com> on 2014-07-03
Reviewed by Gyuyoung Kim.
Use on_search_close_button_clicked() callback to close search bar and on_search_text_found() callback to show search count.
* MiniBrowser/efl/main.c:
(search_box_show):
(search_box_hide):
(on_search_close_button_clicked):
(on_search_text_found):
(window_create):</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 (170785 => 170786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-07-04 01:12:45 UTC (rev 170785)
+++ trunk/Tools/ChangeLog 2014-07-04 05:38:20 UTC (rev 170786)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-03 Shivakumar JM <shiva.jm@samsung.com>
+
+ [EFL][WK2] Enhance the Minibrowser to show text search count and close search bar.
+ https://bugs.webkit.org/show_bug.cgi?id=134486
+
+ Reviewed by Gyuyoung Kim.
+
+ Use on_search_close_button_clicked() callback to close search bar and on_search_text_found() callback to show search count.
+
+ * MiniBrowser/efl/main.c:
+ (search_box_show):
+ (search_box_hide):
+ (on_search_close_button_clicked):
+ (on_search_text_found):
+ (window_create):
+
</ins><span class="cx"> 2014-07-03 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WTF::move()
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (170785 => 170786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2014-07-04 01:12:45 UTC (rev 170785)
+++ trunk/Tools/MiniBrowser/efl/main.c 2014-07-04 05:38:20 UTC (rev 170786)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> static const int TOOL_BAR_ICON_SIZE = 24;
</span><span class="cx"> static const int TOOL_BAR_BUTTON_SIZE = 32;
</span><span class="cx"> static const int SEARCH_FIELD_SIZE = 200;
</span><del>-static const int SEARCH_BUTTON_SIZE = 25;
</del><ins>+static const int SEARCH_BUTTON_SIZE = 30;
</ins><span class="cx"> static const int MAX_SEARCH_COUNT = 100;
</span><span class="cx"> static const int DEFAULT_SEARCH_FLAGS = EWK_FIND_OPTIONS_SHOW_HIGHLIGHT | EWK_FIND_OPTIONS_CASE_INSENSITIVE | EWK_FIND_OPTIONS_WRAP_AROUND;
</span><span class="cx"> static const double TOOLTIP_DELAY_SECONDS = 1.0;
</span><span class="lines">@@ -108,8 +108,10 @@
</span><span class="cx"> struct {
</span><span class="cx"> Evas_Object *search_bar;
</span><span class="cx"> Evas_Object *search_field;
</span><ins>+ Evas_Object *search_field_count;
</ins><span class="cx"> Evas_Object *backward_button;
</span><span class="cx"> Evas_Object *forward_button;
</span><ins>+ Evas_Object *close_button;
</ins><span class="cx"> } search;
</span><span class="cx"> int current_zoom_level;
</span><span class="cx"> Tooltip_Information tooltip;
</span><span class="lines">@@ -368,8 +370,10 @@
</span><span class="cx">
</span><span class="cx"> evas_object_show(window->search.search_bar);
</span><span class="cx"> evas_object_show(window->search.search_field);
</span><ins>+ evas_object_show(window->search.search_field_count);
</ins><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.close_button);
</ins><span class="cx">
</span><span class="cx"> /* Grab focus from the view */
</span><span class="cx"> evas_object_focus_set(window->ewk_view, EINA_FALSE);
</span><span class="lines">@@ -384,8 +388,10 @@
</span><span class="cx"> evas_object_size_hint_min_set(window->search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
</span><span class="cx"> evas_object_hide(window->search.search_bar);
</span><span class="cx"> evas_object_hide(window->search.search_field);
</span><ins>+ evas_object_hide(window->search.search_field_count);
</ins><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.close_button);
</ins><span class="cx">
</span><span class="cx"> /* Give focus back to the view */
</span><span class="cx"> elm_object_focus_set(window->search.search_field, EINA_FALSE);
</span><span class="lines">@@ -1016,6 +1022,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><ins>+on_search_close_button_clicked(void *user_data, Evas_Object *search_close_button, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ search_box_hide(window);
+}
+
+static void
</ins><span class="cx"> on_refresh_button_clicked(void *user_data, Evas_Object *refresh_button, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -1658,6 +1672,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><ins>+on_search_text_found(void *user_data, Evas_Object *obj, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ const int *match_count = (const int *)(event_info);
+
+ if (*match_count) {
+ Eina_Strbuf *search_text = eina_strbuf_new();
+ eina_strbuf_append_printf(search_text, " %d Matches Found " , *match_count);
+ elm_object_text_set(window->search.search_field_count, eina_strbuf_string_get(search_text));
+ eina_strbuf_free(search_text);
+ } else
+ elm_object_text_set(window->search.search_field_count, " No Matches Found");
+
+ evas_object_focus_set(window->ewk_view, EINA_FALSE);
+ elm_object_focus_set(window->search.search_field_count, EINA_FALSE);
+ elm_object_focus_set(window->search.search_field, EINA_TRUE);
+}
+
+static void
</ins><span class="cx"> on_tooltip_text_set(void *user_data, Evas_Object *obj, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -1837,6 +1871,23 @@
</span><span class="cx"> evas_object_size_hint_min_set(window->search.forward_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.forward_button);
</span><span class="cx">
</span><ins>+ /* Create Search count field */
+ window->search.search_field_count = elm_label_add(window->elm_window);
+ evas_object_size_hint_weight_set(window->search.search_field_count, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.search_field_count, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_text_set(window->search.search_field_count, "");
+ elm_entry_text_style_user_push(window->search.search_field_count, "DEFAULT='font_size=14'");
+ elm_box_pack_end(window->search.search_bar, window->search.search_field_count);
+
+ /* Create Search close button */
+ window->search.close_button = create_toolbar_button(window->elm_window, "close");
+ evas_object_smart_callback_add(window->search.close_button, "clicked", on_search_close_button_clicked, window);
+ elm_object_disabled_set(window->search.close_button, EINA_FALSE);
+ evas_object_size_hint_weight_set(window->search.close_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(window->search.close_button, 1.0, 0.5);
+ evas_object_size_hint_min_set(window->search.close_button, SEARCH_BUTTON_SIZE, SEARCH_BUTTON_SIZE);
+ elm_box_pack_end(window->search.search_bar, window->search.close_button);
+
</ins><span class="cx"> /* Create ewk_view */
</span><span class="cx"> Ewk_View_Smart_Class *ewkViewClass = miniBrowserViewSmartClass();
</span><span class="cx"> ewkViewClass->run_javascript_alert = on_javascript_alert;
</span><span class="lines">@@ -1907,6 +1958,7 @@
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "title,changed", on_title_changed, window);
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "url,changed", on_url_changed, window);
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "back,forward,list,changed", on_back_forward_list_changed, window);
</span><ins>+ evas_object_smart_callback_add(window->ewk_view, "text,found", on_search_text_found, window);
</ins><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "tooltip,text,set", on_tooltip_text_set, window);
</span><span class="cx"> evas_object_smart_callback_add(window->ewk_view, "tooltip,text,unset", on_tooltip_text_unset, window);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>