diff options
| author | mbkma <[email protected]> | 2021-06-04 17:42:28 +0200 |
|---|---|---|
| committer | mbkma <[email protected]> | 2021-06-06 10:10:41 +0200 |
| commit | 0376d066702a9315a7a6625976d9bdfa835e7677 (patch) | |
| tree | dc90d30aea12b03c9a99189aadc73dda629e2b6e /shell/eggfindbar.c | |
| parent | ae1c8e7e9e881022bbad8da68b3efcee10268ed0 (diff) | |
| download | atril-find-sidebar.tar.bz2 atril-find-sidebar.tar.xz | |
Improve search systemfind-sidebar
shell: Add EvFindSidebar widget to show search results
see https://gitlab.gnome.org/GNOME/evince/-/commit/940ce8048e4fc6503dca03c1ce090ff4a11dface
eggfindbar: don't close the findbar when it loses the focus
see https://gitlab.gnome.org/GNOME/evince/-/commit/a2d781fb124bd19861035fd41dacc976e00d19ef
shell: Add the findbar to the main box instead of the view box
libview: Add ev_view_find_set_result
Diffstat (limited to 'shell/eggfindbar.c')
| -rw-r--r-- | shell/eggfindbar.c | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index 438c5dc7..2988e021 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -39,7 +39,6 @@ struct _EggFindBarPrivate GtkWidget *find_entry; GtkWidget *status_label; - gulong set_focus_handler; guint case_sensitive : 1; }; @@ -91,9 +90,6 @@ egg_find_bar_class_init (EggFindBarClass *klass) object_class->finalize = egg_find_bar_finalize; - widget_class->show = egg_find_bar_show; - widget_class->hide = egg_find_bar_hide; - widget_class->grab_focus = egg_find_bar_grab_focus; find_bar_signals[NEXT] = @@ -257,27 +253,6 @@ entry_changed_callback (GtkEntry *entry, } static void -set_focus_cb (GtkWidget *window, - GtkWidget *widget, - EggFindBar *bar) -{ - GtkWidget *wbar = GTK_WIDGET (bar); - - while (widget != NULL && widget != wbar) - { - widget = gtk_widget_get_parent (widget); - } - - /* if widget == bar, the new focus widget is in the bar, so we - * don't deactivate. - */ - if (widget != wbar) - { - g_signal_emit (bar, find_bar_signals[CLOSE], 0); - } -} - -static void egg_find_bar_init (EggFindBar *find_bar) { EggFindBarPrivate *priv; @@ -443,46 +418,6 @@ egg_find_bar_get_property (GObject *object, } } -static void -egg_find_bar_show (GtkWidget *widget) -{ - EggFindBar *bar = EGG_FIND_BAR (widget); - EggFindBarPrivate *priv = bar->priv; - - GTK_WIDGET_CLASS (egg_find_bar_parent_class)->show (widget); - - if (priv->set_focus_handler == 0) - { - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (widget); - - priv->set_focus_handler = - g_signal_connect (toplevel, "set-focus", - G_CALLBACK (set_focus_cb), bar); - } -} - -static void -egg_find_bar_hide (GtkWidget *widget) -{ - EggFindBar *bar = EGG_FIND_BAR (widget); - EggFindBarPrivate *priv = bar->priv; - - if (priv->set_focus_handler != 0) - { - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (widget); - - g_signal_handlers_disconnect_by_func - (toplevel, (void (*)) G_CALLBACK (set_focus_cb), bar); - priv->set_focus_handler = 0; - } - - GTK_WIDGET_CLASS (egg_find_bar_parent_class)->hide (widget); -} - void egg_find_bar_grab_focus (GtkWidget *widget) { |