isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-23 01:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[text] Add ClutterText::delete_selection()

Browse Source 
Add a method for deleting the current selection inside a Text actor.

This is useful for subclasses.

See bug:

  http://bugzilla.openedhand.com/show_bug.cgi?id=1521

Based on a patch by: Raymond Liu <raymond.liu@intel.com>
This commit is contained in:
Emmanuele Bassi 2009-05-06 17:08:25 +01:00
parent 79cb0a3515
commit ca23838752
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
clutter/clutter-text.c
View File

@ -415,10 +415,10 @@ clutter_text_create_layout (ClutterText *text,
/* If this cached layout is using the same size then we can /* If this cached layout is using the same size then we can
* just return that directly * just return that directly
*/ */
CLUTTER_NOTE (ACTOR, "ClutterText: %p: cache hit for size %i x %i", CLUTTER_NOTE (ACTOR, "ClutterText: %p: cache hit for size %.2fx%.2f",
text, text,
CLUTTER_UNITS_TO_DEVICE (allocation_width), allocation_width,
CLUTTER_UNITS_TO_DEVICE (allocation_height)); allocation_height);
return priv->cached_layouts[i].layout; return priv->cached_layouts[i].layout;
} }
@ -429,10 +429,10 @@ clutter_text_create_layout (ClutterText *text,
} }
} }
CLUTTER_NOTE (ACTOR, "ClutterText: %p: cache miss for size %i x %i", CLUTTER_NOTE (ACTOR, "ClutterText: %p: cache miss for size %.2fx%.2f",
text, text,
CLUTTER_UNITS_TO_DEVICE (allocation_width), allocation_width,
CLUTTER_UNITS_TO_DEVICE (allocation_height)); allocation_height);
/* If we make it here then we didn't have a cached version so we /* If we make it here then we didn't have a cached version so we
need to recreate the layout */ need to recreate the layout */
@ -562,10 +562,10 @@ clutter_text_ensure_cursor_position (ClutterText *self)
&x, &y, &x, &y,
&cursor_height); &cursor_height);
cursor_pos.x = CLUTTER_UNITS_TO_DEVICE (x); cursor_pos.x = x;
cursor_pos.y = CLUTTER_UNITS_TO_DEVICE (y); cursor_pos.y = y;
cursor_pos.width = priv->cursor_size; cursor_pos.width = priv->cursor_size;
cursor_pos.height = CLUTTER_UNITS_TO_DEVICE (cursor_height) - 2; cursor_pos.height = cursor_height - 2;
x_changed = priv->cursor_pos.x != cursor_pos.x; x_changed = priv->cursor_pos.x != cursor_pos.x;
y_changed = priv->cursor_pos.y != cursor_pos.y; y_changed = priv->cursor_pos.y != cursor_pos.y;
@ -580,13 +580,30 @@ clutter_text_ensure_cursor_position (ClutterText *self)
} }
} }
static gboolean /**
clutter_text_truncate_selection (ClutterText *self) * clutter_text_delete_selection:
* @self: a #ClutterText
*
* Deletes the currently selected text
*
* This function is only useful in subclasses of #ClutterText
*
* Return value: %TRUE if text was deleted or if the text actor
* is empty, and %FALSE otherwise
*
* Since: 1.0
*/
gboolean
clutter_text_delete_selection (ClutterText *self)
{ {
ClutterTextPrivate *priv = self->priv; ClutterTextPrivate *priv;
gint start_index; gint start_index;
gint end_index; gint end_index;
g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
priv = self->priv;
if (!priv->text) if (!priv->text)
return TRUE; return TRUE;
@ -1310,7 +1327,7 @@ clutter_text_key_press (ClutterActor *actor,
/* truncate the eventual selection so that the /* truncate the eventual selection so that the
* Unicode character can replace it * Unicode character can replace it
*/ */
clutter_text_truncate_selection (self); clutter_text_delete_selection (self);
clutter_text_insert_unichar (self, key_unichar); clutter_text_insert_unichar (self, key_unichar);
return TRUE; return TRUE;
@ -1760,7 +1777,7 @@ clutter_text_real_del_next (ClutterText *self,
gint pos; gint pos;
gint len; gint len;
if (clutter_text_truncate_selection (self)) if (clutter_text_delete_selection (self))
return TRUE; return TRUE;
pos = priv->position; pos = priv->position;
@ -1782,7 +1799,7 @@ clutter_text_real_del_prev (ClutterText *self,
gint pos; gint pos;
gint len; gint len;
if (clutter_text_truncate_selection (self)) if (clutter_text_delete_selection (self))
return TRUE; return TRUE;
pos = priv->position; pos = priv->position;

1
clutter/clutter-text.h
View File

@ -186,6 +186,7 @@ void clutter_text_set_selection_color (ClutterText *sel
const ClutterColor *color); const ClutterColor *color);
void clutter_text_get_selection_color (ClutterText *self, void clutter_text_get_selection_color (ClutterText *self,
ClutterColor *color); ClutterColor *color);
gboolean clutter_text_delete_selection (ClutterText *self);
void clutter_text_set_password_char (ClutterText *self, void clutter_text_set_password_char (ClutterText *self,
gunichar wc); gunichar wc);
gunichar clutter_text_get_password_char (ClutterText *self); gunichar clutter_text_get_password_char (ClutterText *self);

1
doc/reference/clutter/clutter-sections.txt
View File

@ -1584,6 +1584,7 @@ clutter_text_insert_text
clutter_text_insert_unichar clutter_text_insert_unichar
clutter_text_delete_chars clutter_text_delete_chars
clutter_text_delete_text clutter_text_delete_text
clutter_text_delete_selection
clutter_text_get_chars clutter_text_get_chars
clutter_text_set_cursor_color clutter_text_set_cursor_color
clutter_text_get_cursor_color clutter_text_get_cursor_color