isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comments and whitespace fixes to ClutterText

Browse Source
This commit is contained in:
Emmanuele Bassi 2009-01-07 00:43:24 +00:00
parent 7f9c384099
commit f3142a70dc
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-text.c
View File

@ -130,11 +130,15 @@ struct _ClutterTextPrivate
/* current 'other end of selection' position */ /* current 'other end of selection' position */
gint selection_bound; gint selection_bound;
/* the x position in the pangolayout, used to /* the x position in the PangoLayout, used to
* avoid drifting when repeatedly moving up|down * avoid drifting when repeatedly moving up|down
*/ */
gint x_pos; gint x_pos;
/* the x position of the PangoLayout when in
* single line mode, to scroll the contents of the
* text actor
*/
gint text_x; gint text_x;
/* the length of the text, in bytes */ /* the length of the text, in bytes */
@ -192,8 +196,7 @@ enum
static guint text_signals[LAST_SIGNAL] = { 0, }; static guint text_signals[LAST_SIGNAL] = { 0, };
#define offset_real(t,p) \ #define offset_real(t,p) ((p) == -1 ? g_utf8_strlen ((t), -1) : (p))
((p) == -1 ? g_utf8_strlen ((t), -1) : (p))
static gint static gint
offset_to_bytes (const gchar *text, offset_to_bytes (const gchar *text,
@ -226,8 +229,7 @@ offset_to_bytes (const gchar *text,
return i; return i;
} }
#define bytes_to_offset(t,p) \ #define bytes_to_offset(t,p) (g_utf8_pointer_to_offset ((t), (t) + (p)))
(g_utf8_pointer_to_offset ((t), (t) + (p)))
static inline void static inline void
@ -419,8 +421,8 @@ clutter_text_create_layout (ClutterText *text,
static gint static gint
clutter_text_coords_to_position (ClutterText *text, clutter_text_coords_to_position (ClutterText *text,
gint x, gint x,
gint y) gint y)
{ {
gint index_; gint index_;
gint px, py; gint px, py;
@ -1020,7 +1022,7 @@ clutter_text_paint (ClutterActor *self)
gint text_x = priv->text_x; gint text_x = priv->text_x;
gboolean clip_set = FALSE; gboolean clip_set = FALSE;
if (priv->font_desc == NULL || priv->text == NULL) if (G_UNLIKELY (priv->font_desc == NULL || priv->text == NULL))
{ {
CLUTTER_NOTE (ACTOR, "desc: %p, text %p", CLUTTER_NOTE (ACTOR, "desc: %p, text %p",
priv->font_desc ? priv->font_desc : 0x0, priv->font_desc ? priv->font_desc : 0x0,
@ -3345,7 +3347,7 @@ clutter_text_get_cursor_size (ClutterText *self)
/** /**
* clutter_text_set_password_char: * clutter_text_set_password_char:
* @self: a #ClutterText * @self: a #ClutterText
* @wc: a Unicode character, or 0 * @wc: a Unicode character, or 0 to unset the password character
* *
* Sets the character to use in place of the actual text in a * Sets the character to use in place of the actual text in a
* password text actor. * password text actor.

0
po/clutter-0.8.pot
View File