callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkHeaderBar: Update separator visibility when needed

Browse Source 
We need to be a little more forthcoming with showing and hiding
the separators - their visibility now depends on the the visibility
and pack type of the regular headerbar children. This was observed
in gnome-contacts, where headerbar buttons are shown and hidden.
This commit is contained in:
Matthias Clasen
2014-08-28 22:54:18 -04:00
parent 7b3c81f688
commit 3404e92312
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkheaderbar.c
View File

@ -1472,6 +1472,14 @@ gtk_header_bar_set_property (GObject *object,
} }
} }
static void
notify_child_cb (GObject *child,
GParamSpec *pspec,
GtkHeaderBar *bar)
{
_gtk_header_bar_update_separator_visibility (bar);
}
static void static void
gtk_header_bar_pack (GtkHeaderBar *bar, gtk_header_bar_pack (GtkHeaderBar *bar,
GtkWidget *widget, GtkWidget *widget,
@ -1490,6 +1498,7 @@ gtk_header_bar_pack (GtkHeaderBar *bar,
gtk_widget_freeze_child_notify (widget); gtk_widget_freeze_child_notify (widget);
gtk_widget_set_parent (widget, GTK_WIDGET (bar)); gtk_widget_set_parent (widget, GTK_WIDGET (bar));
g_signal_connect (widget, "notify::visible", G_CALLBACK (notify_child_cb), bar);
gtk_widget_child_notify (widget, "pack-type"); gtk_widget_child_notify (widget, "pack-type");
gtk_widget_child_notify (widget, "position"); gtk_widget_child_notify (widget, "position");
gtk_widget_thaw_child_notify (widget); gtk_widget_thaw_child_notify (widget);
@ -1535,6 +1544,7 @@ gtk_header_bar_remove (GtkContainer *container,
if (l) if (l)
{ {
child = l->data; child = l->data;
g_signal_handlers_disconnect_by_func (widget, notify_child_cb, bar);
gtk_widget_unparent (child->widget); gtk_widget_unparent (child->widget);
priv->children = g_list_delete_link (priv->children, l); priv->children = g_list_delete_link (priv->children, l);
g_free (child); g_free (child);
@ -1635,16 +1645,18 @@ gtk_header_bar_set_child_property (GtkContainer *container,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkHeaderBar *bar = GTK_HEADER_BAR (container);
GList *l; GList *l;
Child *child; Child *child;
l = find_child_link (GTK_HEADER_BAR (container), widget); l = find_child_link (bar, widget);
child = l->data; child = l->data;
switch (property_id) switch (property_id)
{ {
case CHILD_PROP_PACK_TYPE: case CHILD_PROP_PACK_TYPE:
child->pack_type = g_value_get_enum (value); child->pack_type = g_value_get_enum (value);
_gtk_header_bar_update_separator_visibility (bar);
break; break;
default: default:
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);