window: correctly hide search bar when not in search mode
Search bar shows an annoying border when it should be hidden. This commit fixes it. Fixes bug #739913.
This commit is contained in:
committed by
Erick Pérez Castellanos
parent
4052040be3
commit
97cfe4fd79
@@ -515,6 +515,7 @@ stack_transition_running (GObject *object,
|
|||||||
gtk_container_remove (GTK_CONTAINER (priv->views_stack),
|
gtk_container_remove (GTK_CONTAINER (priv->views_stack),
|
||||||
priv->views[GCAL_WINDOW_VIEW_SEARCH]);
|
priv->views[GCAL_WINDOW_VIEW_SEARCH]);
|
||||||
gtk_widget_hide (priv->views[GCAL_WINDOW_VIEW_SEARCH]);
|
gtk_widget_hide (priv->views[GCAL_WINDOW_VIEW_SEARCH]);
|
||||||
|
gtk_widget_hide (priv->search_bar);
|
||||||
|
|
||||||
gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
|
gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
|
||||||
priv->views_switcher);
|
priv->views_switcher);
|
||||||
@@ -870,6 +871,7 @@ search_toggled (GObject *object,
|
|||||||
if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (priv->search_bar)))
|
if (gtk_search_bar_get_search_mode (GTK_SEARCH_BAR (priv->search_bar)))
|
||||||
{
|
{
|
||||||
g_debug ("Entering search mode");
|
g_debug ("Entering search mode");
|
||||||
|
gtk_widget_show (priv->search_bar);
|
||||||
|
|
||||||
/* update header_bar widget */
|
/* update header_bar widget */
|
||||||
gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
|
gtk_header_bar_set_custom_title (GTK_HEADER_BAR (priv->header_bar),
|
||||||
@@ -1110,6 +1112,7 @@ gcal_window_constructed (GObject *object)
|
|||||||
gtk_container_add (GTK_CONTAINER (box), priv->search_entry);
|
gtk_container_add (GTK_CONTAINER (box), priv->search_entry);
|
||||||
|
|
||||||
priv->search_bar = gtk_search_bar_new ();
|
priv->search_bar = gtk_search_bar_new ();
|
||||||
|
gtk_widget_set_no_show_all (priv->search_bar, TRUE);
|
||||||
gtk_search_bar_connect_entry (GTK_SEARCH_BAR (priv->search_bar),
|
gtk_search_bar_connect_entry (GTK_SEARCH_BAR (priv->search_bar),
|
||||||
GTK_ENTRY (priv->search_entry));
|
GTK_ENTRY (priv->search_entry));
|
||||||
gtk_widget_set_hexpand (priv->search_bar, TRUE);
|
gtk_widget_set_hexpand (priv->search_bar, TRUE);
|
||||||
@@ -1118,6 +1121,7 @@ gcal_window_constructed (GObject *object)
|
|||||||
G_BINDING_BIDIRECTIONAL);
|
G_BINDING_BIDIRECTIONAL);
|
||||||
gtk_container_add (GTK_CONTAINER (priv->search_bar), box);
|
gtk_container_add (GTK_CONTAINER (priv->search_bar), box);
|
||||||
gtk_container_add (GTK_CONTAINER (priv->main_box), priv->search_bar);
|
gtk_container_add (GTK_CONTAINER (priv->main_box), priv->search_bar);
|
||||||
|
gtk_widget_show_all (box);
|
||||||
|
|
||||||
/* overlay */
|
/* overlay */
|
||||||
priv->views_overlay = gtk_overlay_new ();
|
priv->views_overlay = gtk_overlay_new ();
|
||||||
|
|||||||
Reference in New Issue
Block a user