aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Bolsterlee <uws+gnome@xs4all.nl>2006-05-11 22:24:48 +0800
committerWouter Bolsterlee <wbolster@src.gnome.org>2006-05-11 22:24:48 +0800
commitb4806d4fda2a0c557efa4d5cf5640de641b448f4 (patch)
tree20b28c9e5b65294082a5cd1bd31ef776ed50e863
parent16ba41cf94ecd37d5064dabd14a54da93485166f (diff)
downloadgsoc2013-epiphany-b4806d4fda2a0c557efa4d5cf5640de641b448f4.tar.gz
gsoc2013-epiphany-b4806d4fda2a0c557efa4d5cf5640de641b448f4.tar.zst
gsoc2013-epiphany-b4806d4fda2a0c557efa4d5cf5640de641b448f4.zip
Display the find bar for "Find Next" and "Find Previous" if it wasn't
2006-05-11 Wouter Bolsterlee <uws+gnome@xs4all.nl> * src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next), (ephy_find_toolbar_find_previous), (ephy_find_toolbar_open): Display the find bar for "Find Next" and "Find Previous" if it wasn't visible already. Entry focus is handlded with care so that use cases like incremental search work as expected. Fixes bug #333020.
-rw-r--r--ChangeLog10
-rw-r--r--src/ephy-find-toolbar.c13
2 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b14b0397a..6faa13414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-11 Wouter Bolsterlee <uws+gnome@xs4all.nl>
+
+ * src/ephy-find-toolbar.c: (ephy_find_toolbar_find_next),
+ (ephy_find_toolbar_find_previous), (ephy_find_toolbar_open):
+
+ Display the find bar for "Find Next" and "Find Previous"
+ if it wasn't visible already. Entry focus is handlded
+ with care so that use cases like incremental search work
+ as expected. Fixes bug #333020.
+
2006-05-11 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-find-toolbar.c: (entry_changed_cb),
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index d91df26ef..ab04e67bb 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -592,8 +592,12 @@ ephy_find_toolbar_find_next (EphyFindToolbar *toolbar)
EphyEmbedFindResult result;
result = ephy_embed_find_find_again (get_find (toolbar), TRUE);
-
set_status (toolbar, result);
+
+ if (!GTK_WIDGET_VISIBLE(toolbar)) {
+ gtk_widget_show (GTK_WIDGET (toolbar));
+ gtk_widget_grab_focus (GTK_WIDGET (toolbar));
+ }
}
void
@@ -602,8 +606,12 @@ ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar)
EphyEmbedFindResult result;
result = ephy_embed_find_find_again (get_find (toolbar), FALSE);
-
set_status (toolbar, result);
+
+ if (!GTK_WIDGET_VISIBLE(toolbar)) {
+ gtk_widget_show (GTK_WIDGET (toolbar));
+ gtk_widget_grab_focus (GTK_WIDGET (toolbar));
+ }
}
void
@@ -631,7 +639,6 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar,
}
gtk_widget_show (GTK_WIDGET (toolbar));
-
gtk_widget_grab_focus (GTK_WIDGET (toolbar));
}