Merge lp:~evfool/midori/findbar into lp:~vcs-imports/midori/master

[Robert Roth]

Improved findbar to only show the clear icon if there is something to clear (text longer than 1 char) (bug #772841), otherwise hide it, and also reset the primary icon to the find icon after clearing the entry, because if the stop icon was there and the entry was cleared it did not reset, thus we had an empty text entry with a red stop button.

[Jelmer Vernooij (jelmer)]

Hi Robert,

On 22/07/11 10:19, Robert Roth wrote:
> Robert Roth has proposed merging lp:~evfool/midori/findbar into lp:midori.
>
> Requested reviews:
> VCS imports (vcs-imports)
> Related bugs:
> Bug #772841 in Midori: "inline find - don't show the clear button if there is nothing to clear"
> https://bugs.launchpad.net/midori/+bug/772841
>
> For more details, see:
> https://code.launchpad.net/~evfool/midori/findbar/+merge/68801
>
> Improved findbar to only show the clear icon if there is something to clear (text longer than 1 char) (bug #772841), otherwise hide it, and also reset the primary icon to the find icon after clearing the entry, because if the stop icon was there and the entry was cleared it did not reset, thus we had an empty text entry with a red stop button.
lp:midori is an import from the upstream version control system. They
don't use launchpad for development as far as I know. You probably want
to propose the merge in whatever upstream uses.

Cheers,

Jelmer

=== modified file 'toolbars/midori-findbar.c'
--- toolbars/midori-findbar.c	2011-05-27 21:06:23 +0000
+++ toolbars/midori-findbar.c	2011-07-22 08:18:34 +0000
@@ -86,7 +86,13 @@
                                              gpointer      user_data)
 {
     if (icon_pos == GTK_ICON_ENTRY_SECONDARY)
+    {
         gtk_entry_set_text (GTK_ENTRY (entry), "");
+        #if !HAVE_HILDON
+        gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
+                                            GTK_ICON_ENTRY_PRIMARY, GTK_STOCK_FIND);
+        #endif
+    }
 }
 
 static gboolean
@@ -180,8 +186,21 @@
     MidoriBrowser* browser = midori_browser_get_for_widget (entry);
     GtkWidget* view = midori_browser_get_current_tab (browser);
     midori_view_unmark_text_matches (MIDORI_VIEW (view));
-    if (g_utf8_strlen (preedit, -1) > 1)
+    if (g_utf8_strlen (preedit, -1) >= 1) 
+    {
+        #if !HAVE_HILDON
+        gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text),
+                                        GTK_ICON_ENTRY_SECONDARY,
+                                        GTK_STOCK_CLEAR);
+        #endif
         midori_findbar_find_text (findbar, preedit, TRUE);
+    } 
+    else
+        #if !HAVE_HILDON
+        gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (findbar->find_text),
+                                        GTK_ICON_ENTRY_SECONDARY,
+                                        NULL);
+        #endif
 }
 
 static void
@@ -234,9 +253,6 @@
     gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text),
                                         GTK_ICON_ENTRY_PRIMARY,
                                         GTK_STOCK_FIND);
-    gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (findbar->find_text),
-                                        GTK_ICON_ENTRY_SECONDARY,
-                                        GTK_STOCK_CLEAR);
     gtk_icon_entry_set_icon_highlight (GTK_ICON_ENTRY (findbar->find_text),
                                        GTK_ICON_ENTRY_SECONDARY, TRUE);
     #endif