debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unmark the matches when hiding the findbar again

Browse source
This commit is contained in:
Christian Dywan 2009-01-24 22:15:37 +01:00
parent 808a03136d
commit d6cdac4072
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
midori/midori-browser.c
View file

@ -1509,9 +1509,6 @@ _midori_browser_find (MidoriBrowser* browser,
case_sensitive = gtk_toggle_tool_button_get_active ( case_sensitive = gtk_toggle_tool_button_get_active (
GTK_TOGGLE_TOOL_BUTTON (browser->find_case)); GTK_TOGGLE_TOOL_BUTTON (browser->find_case));
view = midori_browser_get_current_tab (browser); view = midori_browser_get_current_tab (browser);
if (GTK_WIDGET_VISIBLE (browser->find))
midori_view_unmark_text_matches (MIDORI_VIEW (view));
midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward); midori_view_search_text (MIDORI_VIEW (view), text, case_sensitive, forward);
} }
@ -1542,11 +1539,14 @@ _find_highlight_toggled (GtkToggleToolButton* toolitem,
} }
static gboolean static gboolean
midori_browser_find_key_press_event_cb (GtkWidget* toolbar, midori_browser_find_key_press_event_cb (GtkWidget* toolbar,
GdkEventKey* event) GdkEventKey* event,
MidoriBrowser* browser)
{ {
if (event->keyval == GDK_Escape) if (event->keyval == GDK_Escape)
{ {
GtkWidget* view = midori_browser_get_current_tab (browser);
midori_view_unmark_text_matches (MIDORI_VIEW (view));
gtk_widget_hide (toolbar); gtk_widget_hide (toolbar);
return TRUE; return TRUE;
} }
@ -4190,7 +4190,7 @@ midori_browser_init (MidoriBrowser* browser)
gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU); gtk_toolbar_set_icon_size (GTK_TOOLBAR (browser->find), GTK_ICON_SIZE_MENU);
gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_style (GTK_TOOLBAR (browser->find), GTK_TOOLBAR_BOTH_HORIZ);
g_signal_connect (browser->find, "key-press-event", g_signal_connect (browser->find, "key-press-event",
G_CALLBACK (midori_browser_find_key_press_event_cb), NULL); G_CALLBACK (midori_browser_find_key_press_event_cb), browser);
toolitem = gtk_tool_item_new (); toolitem = gtk_tool_item_new ();
gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6); gtk_container_set_border_width (GTK_CONTAINER (toolitem), 6);
gtk_container_add (GTK_CONTAINER (toolitem), gtk_container_add (GTK_CONTAINER (toolitem),