AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

popover: Port to g_object_install_properties

Browse Source 
And use the pspecs for notification.
This commit is contained in:
Matthias Clasen 2015-12-02 01:03:35 -05:00
parent 93d9c77ead
commit 564e11cc4e
1 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
gtk/gtkpopover.c
View File

@ -126,7 +126,8 @@ enum {
PROP_POSITION, PROP_POSITION,
PROP_MODAL, PROP_MODAL,
PROP_TRANSITIONS_ENABLED, PROP_TRANSITIONS_ENABLED,
PROP_CONSTRAIN_TO PROP_CONSTRAIN_TO,
NUM_PROPERTIES
}; };
enum { enum {
@ -178,6 +179,7 @@ struct _GtkPopoverPrivate
gint tip_y; gint tip_y;
}; };
static GParamSpec *properties[NUM_PROPERTIES];
static GQuark quark_widget_popovers = 0; static GQuark quark_widget_popovers = 0;
static guint signals[N_SIGNALS] = { 0 }; static guint signals[N_SIGNALS] = { 0 };
@ -1642,13 +1644,13 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.12 * Since: 3.12
*/ */
g_object_class_install_property (object_class, properties[PROP_RELATIVE_TO] =
PROP_RELATIVE_TO, g_param_spec_object ("relative-to",
g_param_spec_object ("relative-to", P_("Relative to"),
P_("Relative to"), P_("Widget the bubble window points to"),
P_("Widget the bubble window points to"), GTK_TYPE_WIDGET,
GTK_TYPE_WIDGET, GTK_PARAM_READWRITE);
GTK_PARAM_READWRITE));
/** /**
* GtkPopover:pointing-to: * GtkPopover:pointing-to:
* *
@ -1656,13 +1658,13 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.12 * Since: 3.12
*/ */
g_object_class_install_property (object_class, properties[PROP_POINTING_TO] =
PROP_POINTING_TO, g_param_spec_boxed ("pointing-to",
g_param_spec_boxed ("pointing-to", P_("Pointing to"),
P_("Pointing to"), P_("Rectangle the bubble window points to"),
P_("Rectangle the bubble window points to"), GDK_TYPE_RECTANGLE,
GDK_TYPE_RECTANGLE, GTK_PARAM_READWRITE);
GTK_PARAM_READWRITE));
/** /**
* GtkPopover:position * GtkPopover:position
* *
@ -1670,13 +1672,12 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.12 * Since: 3.12
*/ */
g_object_class_install_property (object_class, properties[PROP_POSITION] =
PROP_POSITION, g_param_spec_enum ("position",
g_param_spec_enum ("position", P_("Position"),
P_("Position"), P_("Position to place the bubble window"),
P_("Position to place the bubble window"), GTK_TYPE_POSITION_TYPE, GTK_POS_TOP,
GTK_TYPE_POSITION_TYPE, GTK_POS_TOP, GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY);
GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkPopover:modal * GtkPopover:modal
@ -1686,13 +1687,12 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.12 * Since: 3.12
*/ */
g_object_class_install_property (object_class, properties[PROP_MODAL] =
PROP_MODAL, g_param_spec_boolean ("modal",
g_param_spec_boolean ("modal", P_("Modal"),
P_("Modal"), P_("Whether the popover is modal"),
P_("Whether the popover is modal"), TRUE,
TRUE, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkPopover:transitions-enabled * GtkPopover:transitions-enabled
@ -1701,13 +1701,12 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.16 * Since: 3.16
*/ */
g_object_class_install_property (object_class, properties[PROP_TRANSITIONS_ENABLED] =
PROP_TRANSITIONS_ENABLED, g_param_spec_boolean ("transitions-enabled",
g_param_spec_boolean ("transitions-enabled", P_("Transitions enabled"),
P_("Transitions enabled"), P_("Whether show/hide transitions are enabled or not"),
P_("Whether show/hide transitions are enabled or not"), TRUE,
TRUE, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
/** /**
* GtkPopover:constrain-to: * GtkPopover:constrain-to:
@ -1716,13 +1715,15 @@ gtk_popover_class_init (GtkPopoverClass *klass)
* *
* Since: 3.20 * Since: 3.20
*/ */
g_object_class_install_property (object_class, properties[PROP_CONSTRAIN_TO] =
PROP_CONSTRAIN_TO, g_param_spec_enum ("constrain-to",
g_param_spec_enum ("constrain-to", P_("Constraint"),
P_("Constraint"), P_("Constraint for the popover position"),
P_("Constraint for the popover position"), GTK_TYPE_POPOVER_CONSTRAINT, GTK_POPOVER_CONSTRAINT_WINDOW,
GTK_TYPE_POPOVER_CONSTRAINT, GTK_POPOVER_CONSTRAINT_WINDOW, GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
signals[CLOSED] = signals[CLOSED] =
g_signal_new (I_("closed"), g_signal_new (I_("closed"),
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
@ -1994,7 +1995,7 @@ gtk_popover_update_relative_to (GtkPopover *popover,
} }
priv->widget = relative_to; priv->widget = relative_to;
g_object_notify (G_OBJECT (popover), "relative-to"); g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_RELATIVE_TO]);
if (priv->widget) if (priv->widget)
{ {
@ -2059,18 +2060,18 @@ gtk_popover_update_pointing_to (GtkPopover *popover,
else else
priv->has_pointing_to = FALSE; priv->has_pointing_to = FALSE;
g_object_notify (G_OBJECT (popover), "pointing-to"); g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_POINTING_TO]);
} }
static void static void
gtk_popover_update_preferred_position (GtkPopover *popover, gtk_popover_update_preferred_position (GtkPopover *popover,
GtkPositionType position) GtkPositionType position)
{ {
if (popover->priv->preferred_position != position) if (popover->priv->preferred_position == position)
{ return;
popover->priv->preferred_position = position;
g_object_notify (G_OBJECT (popover), "position"); popover->priv->preferred_position = position;
} g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_POSITION]);
} }
/** /**
@ -2266,7 +2267,7 @@ gtk_popover_set_modal (GtkPopover *popover,
if (gtk_widget_is_visible (GTK_WIDGET (popover))) if (gtk_widget_is_visible (GTK_WIDGET (popover)))
gtk_popover_apply_modality (popover, priv->modal); gtk_popover_apply_modality (popover, priv->modal);
g_object_notify (G_OBJECT (popover), "modal"); g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_MODAL]);
} }
/** /**
@ -2311,7 +2312,7 @@ gtk_popover_set_transitions_enabled (GtkPopover *popover,
return; return;
priv->transitions_enabled = transitions_enabled; priv->transitions_enabled = transitions_enabled;
g_object_notify (G_OBJECT (popover), "transitions-enabled"); g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_TRANSITIONS_ENABLED]);
} }
/** /**
@ -2534,7 +2535,7 @@ gtk_popover_set_constrain_to (GtkPopover *popover,
priv->constraint = constraint; priv->constraint = constraint;
gtk_popover_update_position (popover); gtk_popover_update_position (popover);
g_object_notify (G_OBJECT (popover), "constrain-to"); g_object_notify_by_pspec (G_OBJECT (popover), properties[PROP_CONSTRAIN_TO]);
} }
/** /**