mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-28 22:41:43 +00:00
menu button: Add a relief property
This is used in various places.
This commit is contained in:
parent
037454d904
commit
5ec7a31cf1
@ -1853,6 +1853,8 @@ gtk_menu_button_set_icon_name
|
|||||||
gtk_menu_button_get_icon_name
|
gtk_menu_button_get_icon_name
|
||||||
gtk_menu_button_set_label
|
gtk_menu_button_set_label
|
||||||
gtk_menu_button_get_label
|
gtk_menu_button_get_label
|
||||||
|
gtk_menu_button_set_relief
|
||||||
|
gtk_menu_button_get_relief
|
||||||
<SUBSECTION Standard>
|
<SUBSECTION Standard>
|
||||||
GTK_TYPE_MENU_BUTTON
|
GTK_TYPE_MENU_BUTTON
|
||||||
GTK_MENU_BUTTON
|
GTK_MENU_BUTTON
|
||||||
|
@ -155,6 +155,7 @@ enum
|
|||||||
PROP_POPOVER,
|
PROP_POPOVER,
|
||||||
PROP_ICON_NAME,
|
PROP_ICON_NAME,
|
||||||
PROP_LABEL,
|
PROP_LABEL,
|
||||||
|
PROP_RELIEF,
|
||||||
LAST_PROP
|
LAST_PROP
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -198,6 +199,9 @@ gtk_menu_button_set_property (GObject *object,
|
|||||||
case PROP_LABEL:
|
case PROP_LABEL:
|
||||||
gtk_menu_button_set_label (self, g_value_get_string (value));
|
gtk_menu_button_set_label (self, g_value_get_string (value));
|
||||||
break;
|
break;
|
||||||
|
case PROP_RELIEF:
|
||||||
|
gtk_menu_button_set_relief (self, g_value_get_enum (value));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||||
}
|
}
|
||||||
@ -237,6 +241,9 @@ gtk_menu_button_get_property (GObject *object,
|
|||||||
case PROP_LABEL:
|
case PROP_LABEL:
|
||||||
g_value_set_string (value, gtk_menu_button_get_label (GTK_MENU_BUTTON (object)));
|
g_value_set_string (value, gtk_menu_button_get_label (GTK_MENU_BUTTON (object)));
|
||||||
break;
|
break;
|
||||||
|
case PROP_RELIEF:
|
||||||
|
g_value_set_enum (value, gtk_menu_button_get_relief (GTK_MENU_BUTTON (object)));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||||
}
|
}
|
||||||
@ -594,6 +601,14 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
|
|||||||
NULL,
|
NULL,
|
||||||
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
|
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
|
menu_button_props[PROP_RELIEF] =
|
||||||
|
g_param_spec_enum ("relief",
|
||||||
|
P_("Border relief"),
|
||||||
|
P_("The border relief style"),
|
||||||
|
GTK_TYPE_RELIEF_STYLE,
|
||||||
|
GTK_RELIEF_NORMAL,
|
||||||
|
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
|
||||||
|
|
||||||
g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
|
g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
|
||||||
|
|
||||||
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_BUTTON_ACCESSIBLE);
|
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_BUTTON_ACCESSIBLE);
|
||||||
@ -1309,3 +1324,48 @@ gtk_menu_button_get_label (GtkMenuButton *menu_button)
|
|||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gtk_menu_button_set_relief:
|
||||||
|
* @menu_button: The #GtkMenuButton you want to set relief styles of
|
||||||
|
* @relief: The GtkReliefStyle as described above
|
||||||
|
*
|
||||||
|
* Sets the relief style of the edges of the given
|
||||||
|
* #GtkMenuButton widget.
|
||||||
|
*
|
||||||
|
* Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
|
||||||
|
* The default style is, as one can guess, %GTK_RELIEF_NORMAL.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
gtk_menu_button_set_relief (GtkMenuButton *menu_button,
|
||||||
|
GtkReliefStyle relief)
|
||||||
|
{
|
||||||
|
GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button);
|
||||||
|
|
||||||
|
g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
|
||||||
|
|
||||||
|
if (relief == gtk_button_get_relief (GTK_BUTTON (priv->button)))
|
||||||
|
return;
|
||||||
|
|
||||||
|
gtk_button_set_relief (GTK_BUTTON (priv->button), relief);
|
||||||
|
g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_RELIEF]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* gtk_menu_button_get_relief:
|
||||||
|
* @menu_button: The #GtkMenuButton you want the #GtkReliefStyle from.
|
||||||
|
*
|
||||||
|
* Returns the current relief style of the given #GtkMenuButton.
|
||||||
|
*
|
||||||
|
* Returns: The current #GtkReliefStyle
|
||||||
|
*/
|
||||||
|
GtkReliefStyle
|
||||||
|
gtk_menu_button_get_relief (GtkMenuButton *menu_button)
|
||||||
|
{
|
||||||
|
GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button);
|
||||||
|
|
||||||
|
g_return_val_if_fail (GTK_IS_MENU_BUTTON (menu_button), GTK_RELIEF_NORMAL);
|
||||||
|
|
||||||
|
return gtk_button_get_relief (GTK_BUTTON (priv->button));
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -112,6 +112,11 @@ void gtk_menu_button_set_label (GtkMenuButton *menu_button,
|
|||||||
GDK_AVAILABLE_IN_ALL
|
GDK_AVAILABLE_IN_ALL
|
||||||
const char * gtk_menu_button_get_label (GtkMenuButton *menu_button);
|
const char * gtk_menu_button_get_label (GtkMenuButton *menu_button);
|
||||||
|
|
||||||
|
GDK_AVAILABLE_IN_ALL
|
||||||
|
void gtk_menu_button_set_relief (GtkMenuButton *menu_button,
|
||||||
|
GtkReliefStyle relief);
|
||||||
|
GDK_AVAILABLE_IN_ALL
|
||||||
|
GtkReliefStyle gtk_menu_button_get_relief (GtkMenuButton *menu_button);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user