brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st-entry: Add primary-icon and secondary-icon read-write properties

Browse Source 
Instead of simply providing a setter, we now provide real properties.

https://bugzilla.gnome.org/show_bug.cgi?id=783484
This commit is contained in:
Mario Sanchez Prada 2017-06-05 18:43:27 +01:00 committed by Cosimo Cecchi
parent 2e1e00c3de
commit 7f7d18749e
2 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/st/st-entry.c
View File

@ -72,6 +72,8 @@ enum
PROP_0, PROP_0,
PROP_CLUTTER_TEXT, PROP_CLUTTER_TEXT,
PROP_PRIMARY_ICON,
PROP_SECONDARY_ICON,
PROP_HINT_TEXT, PROP_HINT_TEXT,
PROP_TEXT, PROP_TEXT,
PROP_INPUT_PURPOSE, PROP_INPUT_PURPOSE,
@ -122,6 +124,14 @@ st_entry_set_property (GObject *gobject,
switch (prop_id) switch (prop_id)
{ {
case PROP_PRIMARY_ICON:
st_entry_set_primary_icon (entry, g_value_get_object (value));
break;
case PROP_SECONDARY_ICON:
st_entry_set_secondary_icon (entry, g_value_get_object (value));
break;
case PROP_HINT_TEXT: case PROP_HINT_TEXT:
st_entry_set_hint_text (entry, g_value_get_string (value)); st_entry_set_hint_text (entry, g_value_get_string (value));
break; break;
@ -158,6 +168,14 @@ st_entry_get_property (GObject *gobject,
g_value_set_object (value, priv->entry); g_value_set_object (value, priv->entry);
break; break;
case PROP_PRIMARY_ICON:
g_value_set_object (value, priv->primary_icon);
break;
case PROP_SECONDARY_ICON:
g_value_set_object (value, priv->secondary_icon);
break;
case PROP_HINT_TEXT: case PROP_HINT_TEXT:
g_value_set_string (value, priv->hint); g_value_set_string (value, priv->hint);
break; break;
@ -794,6 +812,20 @@ st_entry_class_init (StEntryClass *klass)
G_PARAM_READABLE); G_PARAM_READABLE);
g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec); g_object_class_install_property (gobject_class, PROP_CLUTTER_TEXT, pspec);
pspec = g_param_spec_object ("primary-icon",
"Primary Icon",
"Primary Icon actor",
CLUTTER_TYPE_ACTOR,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_PRIMARY_ICON, pspec);
pspec = g_param_spec_object ("secondary-icon",
"Secondary Icon",
"Secondary Icon actor",
CLUTTER_TYPE_ACTOR,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_SECONDARY_ICON, pspec);
pspec = g_param_spec_string ("hint-text", pspec = g_param_spec_string ("hint-text",
"Hint Text", "Hint Text",
"Text to display when the entry is not focused " "Text to display when the entry is not focused "
@ -1193,6 +1225,23 @@ st_entry_set_primary_icon (StEntry *entry,
_st_entry_set_icon (entry, &priv->primary_icon, icon); _st_entry_set_icon (entry, &priv->primary_icon, icon);
} }
/**
* st_entry_get_primary_icon:
* @entry: a #StEntry
*
* Returns: (transfer none): a #ClutterActor
*/
ClutterActor *
st_entry_get_primary_icon (StEntry *entry)
{
StEntryPrivate *priv;
g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
priv = ST_ENTRY_PRIV (entry);
return priv->primary_icon;
}
/** /**
* st_entry_set_secondary_icon: * st_entry_set_secondary_icon:
* @entry: a #StEntry * @entry: a #StEntry
@ -1213,6 +1262,23 @@ st_entry_set_secondary_icon (StEntry *entry,
_st_entry_set_icon (entry, &priv->secondary_icon, icon); _st_entry_set_icon (entry, &priv->secondary_icon, icon);
} }
/**
* st_entry_get_secondary_icon:
* @entry: a #StEntry
*
* Returns: (transfer none): a #ClutterActor
*/
ClutterActor *
st_entry_get_secondary_icon (StEntry *entry)
{
StEntryPrivate *priv;
g_return_val_if_fail (ST_IS_ENTRY (entry), NULL);
priv = ST_ENTRY_PRIV (entry);
return priv->secondary_icon;
}
/******************************************************************************/ /******************************************************************************/
/*************************** ACCESSIBILITY SUPPORT ****************************/ /*************************** ACCESSIBILITY SUPPORT ****************************/
/******************************************************************************/ /******************************************************************************/

11
src/st/st-entry.h
View File

@ -57,10 +57,13 @@ void st_entry_set_input_hints (StEntry *entry,
GtkInputHints hints); GtkInputHints hints);
GtkInputHints st_entry_get_input_hints (StEntry *entry); GtkInputHints st_entry_get_input_hints (StEntry *entry);
void st_entry_set_primary_icon (StEntry *entry, void st_entry_set_primary_icon (StEntry *entry,
ClutterActor *icon); ClutterActor *icon);
void st_entry_set_secondary_icon (StEntry *entry, ClutterActor * st_entry_get_primary_icon (StEntry *entry);
ClutterActor *icon);
void st_entry_set_secondary_icon (StEntry *entry,
ClutterActor *icon);
ClutterActor * st_entry_get_secondary_icon (StEntry *entry);
typedef void (*StEntryCursorFunc) (StEntry *entry, gboolean use_ibeam, gpointer data); typedef void (*StEntryCursorFunc) (StEntry *entry, gboolean use_ibeam, gpointer data);
void st_entry_set_cursor_func (StEntryCursorFunc func, void st_entry_set_cursor_func (StEntryCursorFunc func,