From c3bffd5eeb0518772e73c232a9091abfb54ab543 Mon Sep 17 00:00:00 2001 From: Kevin Lopez Date: Thu, 16 Mar 2017 12:49:09 +0100 Subject: [PATCH] search-view: no show search view if field is empty When the search field is empty is not needed show the result drop down. https://bugzilla.gnome.org/show_bug.cgi?id=747962 --- data/ui/window.ui | 1 - src/gcal-window.c | 18 +++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/data/ui/window.ui b/data/ui/window.ui index 085c84d3..a7d92677 100644 --- a/data/ui/window.ui +++ b/data/ui/window.ui @@ -291,7 +291,6 @@ - search_entry bottom diff --git a/src/gcal-window.c b/src/gcal-window.c index 0800f409..3233c821 100644 --- a/src/gcal-window.c +++ b/src/gcal-window.c @@ -1197,12 +1197,24 @@ search_changed (GtkEditable *editable, gpointer user_data) { GcalWindow *window = GCAL_WINDOW (user_data); + gint search_length; if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (window->search_bar))) { - /* perform the search */ - gcal_search_view_search (GCAL_SEARCH_VIEW (window->search_view), - "summary", gtk_entry_get_text (GTK_ENTRY (window->search_entry))); + /* perform the search or hide when the field is empty */ + + search_length = gtk_entry_get_text_length (GTK_ENTRY (window->search_entry)); + + if (search_length) + { + gtk_popover_popup (GTK_POPOVER (window->search_view)); + gcal_search_view_search (GCAL_SEARCH_VIEW (window->search_view), + "summary", gtk_entry_get_text (GTK_ENTRY (window->search_entry))); + } + else + { + gtk_popover_popdown (GTK_POPOVER (window->search_view)); + } } }