<!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>[159774] 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/159774">159774</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-25 16:21:07 -0800 (Mon, 25 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Search functionality in MiniBrowser provides feedback on search fail
https://bugs.webkit.org/show_bug.cgi?id=122681
Patch by Andres Gomez <agomez@igalia.com> on 2013-11-25
Reviewed by Mario Sanchez Prada.
When using the search functionality in MiniBrowser, if the search
fails, the entry background color gets red to report the user
about the failing condition. When the entry is cleaned or the
search is again succesful the background turns back to its
original color.
* MiniBrowser/gtk/BrowserSearchBar.c:
(setFailedStyleForEntry): Added.
(doSearch): Sets the entry's background to its original style if
there is no text to search.
(findControllerFailedToFindTextCallback): Added.
(findControllerFoundTextCallback): Added.
(browser_search_bar_init): Creates and adds a new CSS provider to
the text entry so we can change its style based on the success
condition of the search.
(browserSearchBarFinalize): Frees the new CSS provider.
(browser_search_bar_new): Connects the two new handlers to the
"failed-to-find-text" and "found-text" signals emitted by the
WebKitFindController.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkBrowserSearchBarc">trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159773 => 159774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-11-26 00:20:42 UTC (rev 159773)
+++ trunk/Tools/ChangeLog 2013-11-26 00:21:07 UTC (rev 159774)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2013-11-25 Andres Gomez <agomez@igalia.com>
+
+ [GTK] Search functionality in MiniBrowser provides feedback on search fail
+ https://bugs.webkit.org/show_bug.cgi?id=122681
+
+ Reviewed by Mario Sanchez Prada.
+
+ When using the search functionality in MiniBrowser, if the search
+ fails, the entry background color gets red to report the user
+ about the failing condition. When the entry is cleaned or the
+ search is again succesful the background turns back to its
+ original color.
+
+ * MiniBrowser/gtk/BrowserSearchBar.c:
+ (setFailedStyleForEntry): Added.
+ (doSearch): Sets the entry's background to its original style if
+ there is no text to search.
+ (findControllerFailedToFindTextCallback): Added.
+ (findControllerFoundTextCallback): Added.
+ (browser_search_bar_init): Creates and adds a new CSS provider to
+ the text entry so we can change its style based on the success
+ condition of the search.
+ (browserSearchBarFinalize): Frees the new CSS provider.
+ (browser_search_bar_new): Connects the two new handlers to the
+ "failed-to-find-text" and "found-text" signals emitted by the
+ WebKitFindController.
+
</ins><span class="cx"> 2013-11-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Put most of the Cocoa API behind WK_API_ENABLED guards
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserSearchBarc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c (159773 => 159774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c 2013-11-26 00:20:42 UTC (rev 159773)
+++ trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c 2013-11-26 00:21:07 UTC (rev 159774)
</span><span class="lines">@@ -26,11 +26,14 @@
</span><span class="cx"> #include "BrowserSearchBar.h"
</span><span class="cx">
</span><span class="cx">
</span><ins>+static const char *searchEntryFailedStyle = "GtkEntry#searchEntry {background-color: #ff6666;}";
+
</ins><span class="cx"> struct _BrowserSearchBar {
</span><span class="cx"> GtkToolbar parent;
</span><span class="cx">
</span><span class="cx"> WebKitWebView *webView;
</span><span class="cx"> GtkWidget *entry;
</span><ins>+ GtkCssProvider *cssProvider;
</ins><span class="cx"> GtkWidget *prevButton;
</span><span class="cx"> GtkWidget *nextButton;
</span><span class="cx"> GtkWidget *optionsMenu;
</span><span class="lines">@@ -41,6 +44,11 @@
</span><span class="cx">
</span><span class="cx"> G_DEFINE_TYPE(BrowserSearchBar, browser_search_bar, GTK_TYPE_TOOLBAR)
</span><span class="cx">
</span><ins>+static void setFailedStyleForEntry(BrowserSearchBar *searchBar, gboolean failedSearch)
+{
+ gtk_css_provider_load_from_data(searchBar->cssProvider, failedSearch ? searchEntryFailedStyle : "", -1, NULL);
+}
+
</ins><span class="cx"> static void doSearch(BrowserSearchBar *searchBar)
</span><span class="cx"> {
</span><span class="cx"> GtkEntry *entry = GTK_ENTRY(searchBar->entry);
</span><span class="lines">@@ -48,6 +56,7 @@
</span><span class="cx"> if (!gtk_entry_get_text_length(entry)) {
</span><span class="cx"> webkit_find_controller_search_finish(webkit_web_view_get_find_controller(searchBar->webView));
</span><span class="cx"> gtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_SECONDARY, NULL);
</span><ins>+ setFailedStyleForEntry(searchBar, FALSE);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -120,6 +129,16 @@
</span><span class="cx"> doSearch(searchBar);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void findControllerFailedToFindTextCallback(BrowserSearchBar *searchBar)
+{
+ setFailedStyleForEntry(searchBar, TRUE);
+}
+
+static void findControllerFoundTextCallback(BrowserSearchBar *searchBar)
+{
+ setFailedStyleForEntry(searchBar, FALSE);
+}
+
</ins><span class="cx"> static void browser_search_bar_init(BrowserSearchBar *searchBar)
</span><span class="cx"> {
</span><span class="cx"> gtk_widget_set_hexpand(GTK_WIDGET(searchBar), TRUE);
</span><span class="lines">@@ -140,6 +159,9 @@
</span><span class="cx"> gtk_entry_set_icon_from_stock(GTK_ENTRY(searchBar->entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
</span><span class="cx"> gtk_box_pack_start(hBox, searchBar->entry, TRUE, TRUE, 0);
</span><span class="cx">
</span><ins>+ searchBar->cssProvider = gtk_css_provider_new();
+ gtk_style_context_add_provider(gtk_widget_get_style_context(searchBar->entry), GTK_STYLE_PROVIDER(searchBar->cssProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
</ins><span class="cx"> GtkBox *hBoxButtons = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
</span><span class="cx"> gtk_box_pack_start(hBox, GTK_WIDGET(hBoxButtons), TRUE, TRUE, 0);
</span><span class="cx">
</span><span class="lines">@@ -202,6 +224,11 @@
</span><span class="cx"> searchBar->webView = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (searchBar->cssProvider) {
+ g_object_unref(searchBar->cssProvider);
+ searchBar->cssProvider = NULL;
+ }
+
</ins><span class="cx"> if (searchBar->optionsMenu) {
</span><span class="cx"> g_object_unref(searchBar->optionsMenu);
</span><span class="cx"> searchBar->optionsMenu = NULL;
</span><span class="lines">@@ -224,6 +251,10 @@
</span><span class="cx"> GtkWidget *searchBar = GTK_WIDGET(g_object_new(BROWSER_TYPE_SEARCH_BAR, NULL));
</span><span class="cx"> BROWSER_SEARCH_BAR(searchBar)->webView = g_object_ref(webView);
</span><span class="cx">
</span><ins>+ WebKitFindController *controller = webkit_web_view_get_find_controller(webView);
+ g_signal_connect_swapped(controller, "failed-to-find-text", G_CALLBACK(findControllerFailedToFindTextCallback), searchBar);
+ g_signal_connect_swapped(controller, "found-text", G_CALLBACK(findControllerFoundTextCallback), searchBar);
+
</ins><span class="cx"> return searchBar;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>