infobar: Add :revealed property
https://bugzilla.gnome.org/show_bug.cgi?id=710888
This commit is contained in:
parent
45aa018839
commit
e9d84e2653
@ -134,6 +134,7 @@ enum
|
|||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_MESSAGE_TYPE,
|
PROP_MESSAGE_TYPE,
|
||||||
PROP_SHOW_CLOSE_BUTTON,
|
PROP_SHOW_CLOSE_BUTTON,
|
||||||
|
PROP_REVEALED,
|
||||||
LAST_PROP
|
LAST_PROP
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -213,6 +214,9 @@ gtk_info_bar_set_property (GObject *object,
|
|||||||
case PROP_SHOW_CLOSE_BUTTON:
|
case PROP_SHOW_CLOSE_BUTTON:
|
||||||
gtk_info_bar_set_show_close_button (info_bar, g_value_get_boolean (value));
|
gtk_info_bar_set_show_close_button (info_bar, g_value_get_boolean (value));
|
||||||
break;
|
break;
|
||||||
|
case PROP_REVEALED:
|
||||||
|
gtk_info_bar_set_revealed (info_bar, g_value_get_boolean (value));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -235,6 +239,9 @@ gtk_info_bar_get_property (GObject *object,
|
|||||||
case PROP_SHOW_CLOSE_BUTTON:
|
case PROP_SHOW_CLOSE_BUTTON:
|
||||||
g_value_set_boolean (value, gtk_info_bar_get_show_close_button (info_bar));
|
g_value_set_boolean (value, gtk_info_bar_get_show_close_button (info_bar));
|
||||||
break;
|
break;
|
||||||
|
case PROP_REVEALED:
|
||||||
|
g_value_set_boolean (value, gtk_info_bar_get_revealed (info_bar));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -303,36 +310,6 @@ gtk_info_bar_close (GtkInfoBar *info_bar)
|
|||||||
GTK_RESPONSE_CANCEL);
|
GTK_RESPONSE_CANCEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
gtk_info_bar_show (GtkWidget *widget)
|
|
||||||
{
|
|
||||||
GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv;
|
|
||||||
|
|
||||||
GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->show (widget);
|
|
||||||
|
|
||||||
gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
child_revealed (GObject *object, GParamSpec *pspec, gpointer data)
|
|
||||||
{
|
|
||||||
GtkWidget *widget = data;
|
|
||||||
|
|
||||||
GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->hide (widget);
|
|
||||||
g_signal_handlers_disconnect_by_func (object, child_revealed, widget);
|
|
||||||
g_object_notify (G_OBJECT (widget), "visible");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
gtk_info_bar_hide (GtkWidget *widget)
|
|
||||||
{
|
|
||||||
GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv;
|
|
||||||
|
|
||||||
g_signal_connect_object (priv->revealer, "notify::child-revealed",
|
|
||||||
G_CALLBACK (child_revealed), widget, 0);
|
|
||||||
gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gtk_info_bar_class_init (GtkInfoBarClass *klass)
|
gtk_info_bar_class_init (GtkInfoBarClass *klass)
|
||||||
{
|
{
|
||||||
@ -346,9 +323,6 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
|
|||||||
object_class->get_property = gtk_info_bar_get_property;
|
object_class->get_property = gtk_info_bar_get_property;
|
||||||
object_class->set_property = gtk_info_bar_set_property;
|
object_class->set_property = gtk_info_bar_set_property;
|
||||||
|
|
||||||
widget_class->show = gtk_info_bar_show;
|
|
||||||
widget_class->hide = gtk_info_bar_hide;
|
|
||||||
|
|
||||||
klass->close = gtk_info_bar_close;
|
klass->close = gtk_info_bar_close;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -382,6 +356,13 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
|
|||||||
FALSE,
|
FALSE,
|
||||||
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
|
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
|
props[PROP_REVEALED] =
|
||||||
|
g_param_spec_boolean ("revealed",
|
||||||
|
P_("Reveal"),
|
||||||
|
P_("Controls whether the action bar shows its contents or not"),
|
||||||
|
TRUE,
|
||||||
|
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
g_object_class_install_properties (object_class, LAST_PROP, props);
|
g_object_class_install_properties (object_class, LAST_PROP, props);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1262,3 +1243,50 @@ gtk_info_bar_get_show_close_button (GtkInfoBar *info_bar)
|
|||||||
|
|
||||||
return info_bar->priv->show_close_button;
|
return info_bar->priv->show_close_button;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gtk_info_bar_set_revealed:
|
||||||
|
* @info_bar: a #GtkActionBar
|
||||||
|
* @revealed: The new value of the property
|
||||||
|
*
|
||||||
|
* Sets the GtkInfoBar:revealed property to @revealed. This will cause
|
||||||
|
* @info_bar to show up with a slide-in transition.
|
||||||
|
*
|
||||||
|
* Note that this property does not automatically show @info_bar and thus won’t
|
||||||
|
* have any effect if it is invisible.
|
||||||
|
*
|
||||||
|
* Since: 3.22
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
gtk_info_bar_set_revealed (GtkInfoBar *info_bar,
|
||||||
|
gboolean revealed)
|
||||||
|
{
|
||||||
|
GtkInfoBarPrivate *priv = gtk_info_bar_get_instance_private (info_bar);
|
||||||
|
|
||||||
|
g_return_if_fail (GTK_IS_INFO_BAR (info_bar));
|
||||||
|
|
||||||
|
revealed = !!revealed;
|
||||||
|
if (revealed != gtk_revealer_get_reveal_child (GTK_REVEALER (priv->revealer)))
|
||||||
|
{
|
||||||
|
gtk_revealer_set_reveal_child (GTK_REVEALER (priv->revealer), revealed);
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (info_bar), props[PROP_REVEALED]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gtk_info_bar_get_revealed:
|
||||||
|
* @info_bar: a #GtkInfoBar
|
||||||
|
*
|
||||||
|
* Returns: the current value of the GtkInfoBar:revealed property.
|
||||||
|
*
|
||||||
|
* Since: 3.22
|
||||||
|
*/
|
||||||
|
gboolean
|
||||||
|
gtk_info_bar_get_revealed (GtkInfoBar *info_bar)
|
||||||
|
{
|
||||||
|
GtkInfoBarPrivate *priv = gtk_info_bar_get_instance_private (info_bar);
|
||||||
|
|
||||||
|
g_return_val_if_fail (GTK_IS_INFO_BAR (info_bar), FALSE);
|
||||||
|
|
||||||
|
return gtk_revealer_get_reveal_child (GTK_REVEALER (priv->revealer));
|
||||||
|
}
|
||||||
|
@ -130,6 +130,12 @@ void gtk_info_bar_set_show_close_button (GtkInfoBar *info_bar,
|
|||||||
GDK_AVAILABLE_IN_3_10
|
GDK_AVAILABLE_IN_3_10
|
||||||
gboolean gtk_info_bar_get_show_close_button (GtkInfoBar *info_bar);
|
gboolean gtk_info_bar_get_show_close_button (GtkInfoBar *info_bar);
|
||||||
|
|
||||||
|
GDK_AVAILABLE_IN_3_22
|
||||||
|
void gtk_info_bar_set_revealed (GtkInfoBar *info_bar,
|
||||||
|
gboolean revealed);
|
||||||
|
GDK_AVAILABLE_IN_3_22
|
||||||
|
gboolean gtk_info_bar_get_revealed (GtkInfoBar *info_bar);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __GTK_INFO_BAR_H__ */
|
#endif /* __GTK_INFO_BAR_H__ */
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
<child>
|
<child>
|
||||||
<object class="GtkRevealer" id="revealer">
|
<object class="GtkRevealer" id="revealer">
|
||||||
<property name="visible">1</property>
|
<property name="visible">1</property>
|
||||||
|
<property name="reveal-child">1</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox" id="content">
|
<object class="GtkBox" id="content">
|
||||||
<property name="visible">1</property>
|
<property name="visible">1</property>
|
||||||
|
Loading…
Reference in New Issue
Block a user