<!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>[206578] 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/206578">206578</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-29 03:28:14 -0700 (Thu, 29 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Add search button to url bar in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=162716
Patch by Gyuyoung Kim <gyuyoung.kim@navercorp.com> on 2016-09-29
Reviewed by Michael Catanzaro.
As a bug title, it would be good to add a search button to URL bar.
Additionally this patch changes color of button to recognize the buttons.
* MiniBrowser/efl/main.c:
(_search_button_clicked_cb):
(_create_toolbar_button):
(window_create):
(create_toolbar_button): Deleted.</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 (206577 => 206578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-29 09:52:52 UTC (rev 206577)
+++ trunk/Tools/ChangeLog 2016-09-29 10:28:14 UTC (rev 206578)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-29 Gyuyoung Kim <gyuyoung.kim@navercorp.com>
+
+ [EFL] Add search button to url bar in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=162716
+
+ Reviewed by Michael Catanzaro.
+
+ As a bug title, it would be good to add a search button to URL bar.
+ Additionally this patch changes color of button to recognize the buttons.
+
+ * MiniBrowser/efl/main.c:
+ (_search_button_clicked_cb):
+ (_create_toolbar_button):
+ (window_create):
+ (create_toolbar_button): Deleted.
+
</ins><span class="cx"> 2016-09-28 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> API test WebKit2.AutoLayoutIntegration is a flaky timeout
</span></span></pre></div>
<a id="trunkToolsMiniBrowsereflmainc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/efl/main.c (206577 => 206578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/efl/main.c 2016-09-29 09:52:52 UTC (rev 206577)
+++ trunk/Tools/MiniBrowser/efl/main.c 2016-09-29 10:28:14 UTC (rev 206578)
</span><span class="lines">@@ -2046,6 +2046,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void
</span><ins>+_search_button_clicked_cb(void *user_data, Evas_Object *home_button, void *event_info)
+{
+ Browser_Window *window = (Browser_Window *)user_data;
+
+ search_box_show(window);
+}
+
+static void
</ins><span class="cx"> _home_button_clicked_cb(void *user_data, Evas_Object *home_button, void *event_info)
</span><span class="cx"> {
</span><span class="cx"> Browser_Window *window = (Browser_Window *)user_data;
</span><span class="lines">@@ -2061,7 +2069,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Evas_Object *
</span><del>-create_toolbar_button(Evas_Object *elm_window, const char *icon_name)
</del><ins>+_create_toolbar_button(Evas_Object *elm_window, const char *icon_name)
</ins><span class="cx"> {
</span><span class="cx"> Evas_Object *button = elm_button_add(elm_window);
</span><span class="cx">
</span><span class="lines">@@ -2068,7 +2076,7 @@
</span><span class="cx"> Evas_Object *icon = elm_icon_add(elm_window);
</span><span class="cx"> elm_icon_standard_set(icon, icon_name);
</span><span class="cx"> evas_object_size_hint_max_set(icon, TOOL_BAR_ICON_SIZE, TOOL_BAR_ICON_SIZE);
</span><del>- evas_object_color_set(icon, 44, 44, 102, 128);
</del><ins>+ evas_object_color_set(icon, 0, 255, 255, 255);
</ins><span class="cx"> evas_object_show(icon);
</span><span class="cx"> elm_object_part_content_set(button, "icon", icon);
</span><span class="cx"> evas_object_size_hint_min_set(button, TOOL_BAR_BUTTON_SIZE, TOOL_BAR_BUTTON_SIZE);
</span><span class="lines">@@ -2124,7 +2132,7 @@
</span><span class="cx"> evas_object_show(window->horizontal_layout);
</span><span class="cx">
</span><span class="cx"> /* Create Back button */
</span><del>- window->back_button = create_toolbar_button(window->elm_window, "arrow_left");
</del><ins>+ window->back_button = _create_toolbar_button(window->elm_window, "arrow_left");
</ins><span class="cx"> evas_object_smart_callback_add(window->back_button, "clicked", _back_button_clicked_cb, window);
</span><span class="cx"> evas_object_smart_callback_add(window->back_button, "repeated", _back_button_longpress_cb, window);
</span><span class="cx"> elm_object_tooltip_text_set(window->back_button, "Click to go back, longpress to see session history");
</span><span class="lines">@@ -2136,7 +2144,7 @@
</span><span class="cx"> evas_object_show(window->back_button);
</span><span class="cx">
</span><span class="cx"> /* Create Forward button */
</span><del>- window->forward_button = create_toolbar_button(window->elm_window, "arrow_right");
</del><ins>+ window->forward_button = _create_toolbar_button(window->elm_window, "arrow_right");
</ins><span class="cx"> evas_object_smart_callback_add(window->forward_button, "clicked", _forward_button_clicked_cb, window);
</span><span class="cx"> evas_object_smart_callback_add(window->forward_button, "repeated", _forward_button_longpress_cb, window);
</span><span class="cx"> elm_object_tooltip_text_set(window->forward_button, "Click to go forward, longpress to see session history");
</span><span class="lines">@@ -2147,6 +2155,16 @@
</span><span class="cx"> elm_box_pack_end(window->horizontal_layout, window->forward_button);
</span><span class="cx"> evas_object_show(window->forward_button);
</span><span class="cx">
</span><ins>+ /* Create Search button */
+ Evas_Object *search_button = _create_toolbar_button(window->elm_window, "toolbar/search");
+ evas_object_smart_callback_add(search_button, "clicked", _search_button_clicked_cb, window);
+ elm_object_tooltip_text_set(search_button, "Find text");
+ elm_object_tooltip_window_mode_set(search_button, EINA_TRUE);
+ evas_object_size_hint_weight_set(search_button, 0.0, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(search_button, 1.0, 0.5);
+ elm_box_pack_end(window->horizontal_layout, search_button);
+ evas_object_show(search_button);
+
</ins><span class="cx"> /* Create URL bar */
</span><span class="cx"> window->url_bar = elm_entry_add(window->elm_window);
</span><span class="cx"> elm_entry_scrollable_set(window->url_bar, EINA_TRUE);
</span><span class="lines">@@ -2162,7 +2180,7 @@
</span><span class="cx"> evas_object_show(window->url_bar);
</span><span class="cx">
</span><span class="cx"> /* Create Refresh button */
</span><del>- Evas_Object *refresh_button = create_toolbar_button(window->elm_window, "refresh");
</del><ins>+ Evas_Object *refresh_button = _create_toolbar_button(window->elm_window, "refresh");
</ins><span class="cx"> evas_object_smart_callback_add(refresh_button, "clicked", _refresh_button_clicked_cb, window);
</span><span class="cx"> elm_object_tooltip_text_set(refresh_button, "Reload page");
</span><span class="cx"> elm_object_tooltip_window_mode_set(refresh_button, EINA_TRUE);
</span><span class="lines">@@ -2172,7 +2190,7 @@
</span><span class="cx"> evas_object_show(refresh_button);
</span><span class="cx">
</span><span class="cx"> /* Create Stop button */
</span><del>- Evas_Object *stop_button = create_toolbar_button(window->elm_window, "close");
</del><ins>+ Evas_Object *stop_button = _create_toolbar_button(window->elm_window, "close");
</ins><span class="cx"> evas_object_smart_callback_add(stop_button, "clicked", _stop_button_clicked_cb, window);
</span><span class="cx"> elm_object_tooltip_text_set(stop_button, "Stop page load");
</span><span class="cx"> elm_object_tooltip_window_mode_set(stop_button, EINA_TRUE);
</span><span class="lines">@@ -2182,7 +2200,7 @@
</span><span class="cx"> evas_object_show(stop_button);
</span><span class="cx">
</span><span class="cx"> /* Create Home button */
</span><del>- Evas_Object *home_button = create_toolbar_button(window->elm_window, "home");
</del><ins>+ Evas_Object *home_button = _create_toolbar_button(window->elm_window, "home");
</ins><span class="cx"> evas_object_smart_callback_add(home_button, "clicked", _home_button_clicked_cb, window);
</span><span class="cx"> elm_object_tooltip_text_set(home_button, "Home page");
</span><span class="cx"> elm_object_tooltip_window_mode_set(home_button, EINA_TRUE);
</span><span class="lines">@@ -2214,7 +2232,7 @@
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.search_field);
</span><span class="cx">
</span><span class="cx"> /* Create Search backward button */
</span><del>- window->search.backward_button = create_toolbar_button(window->elm_window, "arrow_up");
</del><ins>+ window->search.backward_button = _create_toolbar_button(window->elm_window, "arrow_up");
</ins><span class="cx"> evas_object_smart_callback_add(window->search.backward_button, "clicked", _search_backward_button_clicked_cb, window);
</span><span class="cx"> elm_object_disabled_set(window->search.backward_button, EINA_FALSE);
</span><span class="cx"> evas_object_size_hint_weight_set(window->search.backward_button, 0.0, EVAS_HINT_EXPAND);
</span><span class="lines">@@ -2223,7 +2241,7 @@
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.backward_button);
</span><span class="cx">
</span><span class="cx"> /* Create Search forwardward button */
</span><del>- window->search.forward_button = create_toolbar_button(window->elm_window, "arrow_down");
</del><ins>+ window->search.forward_button = _create_toolbar_button(window->elm_window, "arrow_down");
</ins><span class="cx"> evas_object_smart_callback_add(window->search.forward_button, "clicked", _search_forward_button_clicked_cb, window);
</span><span class="cx"> elm_object_disabled_set(window->search.forward_button, EINA_FALSE);
</span><span class="cx"> evas_object_size_hint_weight_set(window->search.forward_button, 0.0, EVAS_HINT_EXPAND);
</span><span class="lines">@@ -2251,7 +2269,7 @@
</span><span class="cx"> elm_box_pack_end(window->search.search_bar, window->search.search_word_start_check_box);
</span><span class="cx">
</span><span class="cx"> /* Create Search close button */
</span><del>- window->search.close_button = create_toolbar_button(window->elm_window, "close");
</del><ins>+ window->search.close_button = _create_toolbar_button(window->elm_window, "close");
</ins><span class="cx"> evas_object_smart_callback_add(window->search.close_button, "clicked", _search_close_button_clicked_cb, window);
</span><span class="cx"> elm_object_disabled_set(window->search.close_button, EINA_FALSE);
</span><span class="cx"> evas_object_size_hint_weight_set(window->search.close_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
</span></span></pre>
</div>
</div>
</body>
</html>