mirror of
https://github.com/brl/mutter.git
synced 2025-02-18 14:14:10 +00:00
clutter/text: Remove deprecated prop/signal
Shell doesn't use them and they have been deprecated for very long time Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3379>
This commit is contained in:
parent
2b871765f0
commit
3184986897
@ -234,7 +234,6 @@ enum
|
|||||||
PROP_LINE_WRAP_MODE,
|
PROP_LINE_WRAP_MODE,
|
||||||
PROP_JUSTIFY,
|
PROP_JUSTIFY,
|
||||||
PROP_ELLIPSIZE,
|
PROP_ELLIPSIZE,
|
||||||
PROP_POSITION, /* XXX:2.0 - remove */
|
|
||||||
PROP_SELECTION_BOUND,
|
PROP_SELECTION_BOUND,
|
||||||
PROP_SELECTION_COLOR,
|
PROP_SELECTION_COLOR,
|
||||||
PROP_SELECTION_COLOR_SET,
|
PROP_SELECTION_COLOR_SET,
|
||||||
@ -262,7 +261,6 @@ static GParamSpec *obj_props[PROP_LAST];
|
|||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
TEXT_CHANGED,
|
TEXT_CHANGED,
|
||||||
CURSOR_EVENT, /* XXX:2.0 - remove */
|
|
||||||
ACTIVATE,
|
ACTIVATE,
|
||||||
INSERT_TEXT,
|
INSERT_TEXT,
|
||||||
DELETE_TEXT,
|
DELETE_TEXT,
|
||||||
@ -1337,7 +1335,6 @@ clutter_text_ensure_cursor_position (ClutterText *self,
|
|||||||
{
|
{
|
||||||
priv->cursor_rect = cursor_rect;
|
priv->cursor_rect = cursor_rect;
|
||||||
|
|
||||||
g_signal_emit (self, text_signals[CURSOR_EVENT], 0, &cursor_rect);
|
|
||||||
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
||||||
|
|
||||||
update_cursor_location (self);
|
update_cursor_location (self);
|
||||||
@ -1396,8 +1393,6 @@ clutter_text_delete_selection (ClutterText *self)
|
|||||||
/* Not required to be guarded by g_object_freeze/thaw_notify */
|
/* Not required to be guarded by g_object_freeze/thaw_notify */
|
||||||
if (priv->position != old_position)
|
if (priv->position != old_position)
|
||||||
{
|
{
|
||||||
/* XXX:2.0 - remove */
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]);
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_POSITION]);
|
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_POSITION]);
|
||||||
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
||||||
}
|
}
|
||||||
@ -1543,7 +1538,6 @@ clutter_text_set_property (GObject *gobject,
|
|||||||
clutter_text_set_ellipsize (self, g_value_get_enum (value));
|
clutter_text_set_ellipsize (self, g_value_get_enum (value));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_POSITION: /* XXX:2.0: remove */
|
|
||||||
case PROP_CURSOR_POSITION:
|
case PROP_CURSOR_POSITION:
|
||||||
clutter_text_set_cursor_position (self, g_value_get_int (value));
|
clutter_text_set_cursor_position (self, g_value_get_int (value));
|
||||||
break;
|
break;
|
||||||
@ -1660,7 +1654,6 @@ clutter_text_get_property (GObject *gobject,
|
|||||||
g_value_set_int (value, priv->cursor_size);
|
g_value_set_int (value, priv->cursor_size);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_POSITION: /* XXX:2.0 - remove */
|
|
||||||
case PROP_CURSOR_POSITION:
|
case PROP_CURSOR_POSITION:
|
||||||
g_value_set_int (value, priv->position);
|
g_value_set_int (value, priv->position);
|
||||||
break;
|
break;
|
||||||
@ -4000,22 +3993,6 @@ clutter_text_class_init (ClutterTextClass *klass)
|
|||||||
obj_props[PROP_CURSOR_SIZE] = pspec;
|
obj_props[PROP_CURSOR_SIZE] = pspec;
|
||||||
g_object_class_install_property (gobject_class, PROP_CURSOR_SIZE, pspec);
|
g_object_class_install_property (gobject_class, PROP_CURSOR_SIZE, pspec);
|
||||||
|
|
||||||
/**
|
|
||||||
* ClutterText:position:
|
|
||||||
*
|
|
||||||
* The current input cursor position. -1 is taken to be the end of the text
|
|
||||||
*
|
|
||||||
* Deprecated: 1.12: Use [property@Text:cursor-position] instead.
|
|
||||||
*/
|
|
||||||
pspec = g_param_spec_int ("position", NULL, NULL,
|
|
||||||
-1, G_MAXINT,
|
|
||||||
-1,
|
|
||||||
G_PARAM_READWRITE |
|
|
||||||
G_PARAM_STATIC_STRINGS |
|
|
||||||
G_PARAM_DEPRECATED);
|
|
||||||
obj_props[PROP_POSITION] = pspec;
|
|
||||||
g_object_class_install_property (gobject_class, PROP_POSITION, pspec);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ClutterText:cursor-position:
|
* ClutterText:cursor-position:
|
||||||
*
|
*
|
||||||
@ -4295,27 +4272,6 @@ clutter_text_class_init (ClutterTextClass *klass)
|
|||||||
G_TYPE_INT,
|
G_TYPE_INT,
|
||||||
G_TYPE_INT);
|
G_TYPE_INT);
|
||||||
|
|
||||||
/**
|
|
||||||
* ClutterText::cursor-event:
|
|
||||||
* @self: the #ClutterText that emitted the signal
|
|
||||||
* @rect: the coordinates of the cursor
|
|
||||||
*
|
|
||||||
* The signal is emitted whenever the cursor position
|
|
||||||
* changes inside a #ClutterText actor. Inside @rect it is stored
|
|
||||||
* the current position and size of the cursor, relative to the actor
|
|
||||||
* itself.
|
|
||||||
*
|
|
||||||
* Deprecated: 1.16: Use the [signal@Text::cursor-changed] signal instead
|
|
||||||
*/
|
|
||||||
text_signals[CURSOR_EVENT] =
|
|
||||||
g_signal_new (I_("cursor-event"),
|
|
||||||
G_TYPE_FROM_CLASS (gobject_class),
|
|
||||||
G_SIGNAL_RUN_LAST | G_SIGNAL_DEPRECATED,
|
|
||||||
G_STRUCT_OFFSET (ClutterTextClass, cursor_event),
|
|
||||||
NULL, NULL, NULL,
|
|
||||||
G_TYPE_NONE, 1,
|
|
||||||
GRAPHENE_TYPE_RECT | G_SIGNAL_TYPE_STATIC_SCOPE);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ClutterText::cursor-changed:
|
* ClutterText::cursor-changed:
|
||||||
* @self: the #ClutterText that emitted the signal
|
* @self: the #ClutterText that emitted the signal
|
||||||
@ -6034,8 +5990,6 @@ clutter_text_set_cursor_position (ClutterText *self,
|
|||||||
|
|
||||||
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
|
clutter_text_queue_redraw (CLUTTER_ACTOR (self));
|
||||||
|
|
||||||
/* XXX:2.0 - remove */
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_POSITION]);
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_POSITION]);
|
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_POSITION]);
|
||||||
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,6 @@ struct _ClutterText
|
|||||||
* ClutterTextClass:
|
* ClutterTextClass:
|
||||||
* @text_changed: class handler for the #ClutterText::text-changed signal
|
* @text_changed: class handler for the #ClutterText::text-changed signal
|
||||||
* @activate: class handler for the #ClutterText::activate signal
|
* @activate: class handler for the #ClutterText::activate signal
|
||||||
* @cursor_event: class handler for the #ClutterText::cursor-event signal
|
|
||||||
* @cursor_changed: class handler for the #ClutterText::cursor-changed signal
|
* @cursor_changed: class handler for the #ClutterText::cursor-changed signal
|
||||||
*
|
*
|
||||||
* The #ClutterTextClass struct contains only private data.
|
* The #ClutterTextClass struct contains only private data.
|
||||||
@ -71,8 +70,6 @@ struct _ClutterTextClass
|
|||||||
/* signals, not vfuncs */
|
/* signals, not vfuncs */
|
||||||
void (* text_changed) (ClutterText *self);
|
void (* text_changed) (ClutterText *self);
|
||||||
void (* activate) (ClutterText *self);
|
void (* activate) (ClutterText *self);
|
||||||
void (* cursor_event) (ClutterText *self,
|
|
||||||
const graphene_rect_t *rect);
|
|
||||||
void (* cursor_changed) (ClutterText *self);
|
void (* cursor_changed) (ClutterText *self);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user