aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-01-31 00:32:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-01-31 00:33:28 +0800
commit0109aa3a92b484ebb85c6481e5a8e39819b1f011 (patch)
treee7837b0a50517fc160a7b4d6d47f5c78a5505523 /widgets/text
parentf25d21294158625477c529a679fd2f27fffb562c (diff)
downloadgsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar.gz
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar.bz2
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar.lz
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar.xz
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.tar.zst
gsoc2013-evolution-0109aa3a92b484ebb85c6481e5a8e39819b1f011.zip
More whitespace cleanup.
Diffstat (limited to 'widgets/text')
-rw-r--r--widgets/text/e-reflow.c6
-rw-r--r--widgets/text/e-text.c14
-rw-r--r--widgets/text/gal-a11y-e-text-factory.c2
-rw-r--r--widgets/text/gal-a11y-e-text.c246
4 files changed, 134 insertions, 134 deletions
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 04572d9cce..8adbace707 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -1252,12 +1252,12 @@ e_reflow_draw (GnomeCanvasItem *item,
if (running_width > x + width)
break;
x_rect = running_width;
- cairo_rectangle (cr,
+ cairo_rectangle (cr,
x_rect - x,
y_rect - y,
width_rect - 1,
height_rect - 1);
- cairo_fill (cr);
+ cairo_fill (cr);
running_width += E_REFLOW_DIVIDER_WIDTH + E_REFLOW_BORDER_WIDTH + column_width + E_REFLOW_BORDER_WIDTH;
}
cairo_restore (cr);
@@ -1358,7 +1358,7 @@ static GnomeCanvasItem *
e_reflow_point (GnomeCanvasItem *item,
gdouble x, gdouble y, gint cx, gint cy)
{
- GnomeCanvasItem *child;
+ GnomeCanvasItem *child;
if (GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point)
child = GNOME_CANVAS_ITEM_CLASS (e_reflow_parent_class)->point (item, x, y, cx, cy);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index edd0a74fcc..5277031a06 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -766,7 +766,7 @@ e_text_set_property (GObject *object,
needs_update = 1;
break;
- case PROP_FILL_COLOR:
+ case PROP_FILL_COLOR:
if (g_value_get_string (value))
gdk_color_parse (g_value_get_string (value), &color);
@@ -792,7 +792,7 @@ e_text_set_property (GObject *object,
needs_update = 1;
break;
- case PROP_FILL_COLOR_RGBA:
+ case PROP_FILL_COLOR_RGBA:
text->rgba = g_value_get_uint (value);
color.red = ((text->rgba >> 24) & 0xff) * 0x101;
color.green = ((text->rgba >> 16) & 0xff) * 0x101;
@@ -1306,11 +1306,11 @@ e_text_draw (GnomeCanvasItem *item, cairo_t *cr,
if (text->draw_background || text->draw_button) {
gdk_cairo_set_source_color (cr, &style->fg[state]);
} else {
- cairo_set_source_rgba (cr,
- ((text->rgba >> 24) & 0xff) / 255.0,
- ((text->rgba >> 16) & 0xff) / 255.0,
- ((text->rgba >> 8) & 0xff) / 255.0,
- ( text->rgba & 0xff) / 255.0);
+ cairo_set_source_rgba (cr,
+ ((text->rgba >> 24) & 0xff) / 255.0,
+ ((text->rgba >> 16) & 0xff) / 255.0,
+ ((text->rgba >> 8) & 0xff) / 255.0,
+ ( text->rgba & 0xff) / 255.0);
}
if (text->draw_borders || text->draw_background) {
diff --git a/widgets/text/gal-a11y-e-text-factory.c b/widgets/text/gal-a11y-e-text-factory.c
index d68e2ce549..0c933c2245 100644
--- a/widgets/text/gal-a11y-e-text-factory.c
+++ b/widgets/text/gal-a11y-e-text-factory.c
@@ -33,7 +33,7 @@ static AtkObjectFactoryClass *parent_class;
static GType
gal_a11y_e_text_factory_get_accessible_type (void)
{
- return GAL_A11Y_TYPE_E_TEXT;
+ return GAL_A11Y_TYPE_E_TEXT;
}
static AtkObject*
diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 45bd9341ec..75e3307373 100644
--- a/widgets/text/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
@@ -121,14 +121,14 @@ et_get_text (AtkText *text,
gint start_offset,
gint end_offset)
{
- gint start, end, real_start, real_end, len;
+ gint start, end, real_start, real_end, len;
const gchar *full_text = et_get_full_text (text);
- if (full_text == NULL)
- return NULL;
- len = g_utf8_strlen (full_text, -1);
+ if (full_text == NULL)
+ return NULL;
+ len = g_utf8_strlen (full_text, -1);
- start = MIN (MAX (0, start_offset), len);
- end = MIN (MAX (-1, end_offset), len);
+ start = MIN (MAX (0, start_offset), len);
+ end = MIN (MAX (-1, end_offset), len);
if (end_offset == -1)
end = strlen (full_text);
@@ -236,23 +236,23 @@ find_sentence_end (const gchar *text,
gint begin_offset,
gint step)
{
- gint offset;
- gchar *at_offset;
- gunichar previous;
- gint len;
-
- offset = begin_offset;
- len = g_utf8_strlen (text, -1);
-
- while (offset > 0 && offset < len) {
- at_offset = g_utf8_offset_to_pointer (text, offset - 1);
- previous = g_utf8_get_char_validated (at_offset, -1);
- if (previous == '.' || previous == '!' || previous == '?')
- break;
- offset += step;
- }
-
- return offset;
+ gint offset;
+ gchar *at_offset;
+ gunichar previous;
+ gint len;
+
+ offset = begin_offset;
+ len = g_utf8_strlen (text, -1);
+
+ while (offset > 0 && offset < len) {
+ at_offset = g_utf8_offset_to_pointer (text, offset - 1);
+ previous = g_utf8_get_char_validated (at_offset, -1);
+ if (previous == '.' || previous == '!' || previous == '?')
+ break;
+ offset += step;
+ }
+
+ return offset;
}
static gint
@@ -260,23 +260,23 @@ find_line_start (const gchar *text,
gint begin_offset,
gint step)
{
- gint offset;
- gchar *at_offset;
- gunichar previous;
- gint len;
-
- offset = begin_offset;
- len = g_utf8_strlen (text, -1);
-
- while (offset > 0 && offset < len) {
- at_offset = g_utf8_offset_to_pointer (text, offset - 1);
- previous = g_utf8_get_char_validated (at_offset, -1);
- if (previous == '\n' || previous == '\r')
- break;
- offset += step;
- }
-
- return offset;
+ gint offset;
+ gchar *at_offset;
+ gunichar previous;
+ gint len;
+
+ offset = begin_offset;
+ len = g_utf8_strlen (text, -1);
+
+ while (offset > 0 && offset < len) {
+ at_offset = g_utf8_offset_to_pointer (text, offset - 1);
+ previous = g_utf8_get_char_validated (at_offset, -1);
+ if (previous == '\n' || previous == '\r')
+ break;
+ offset += step;
+ }
+
+ return offset;
}
static gint
@@ -284,23 +284,23 @@ find_line_end (const gchar *text,
gint begin_offset,
gint step)
{
- gint offset;
- gchar *at_offset;
- gunichar current;
- gint len;
-
- offset = begin_offset;
- len = g_utf8_strlen (text, -1);
-
- while (offset >= 0 && offset < len) {
- at_offset = g_utf8_offset_to_pointer (text, offset);
- current = g_utf8_get_char_validated (at_offset, -1);
- if (current == '\n' || current == '\r')
- break;
- offset += step;
- }
-
- return offset;
+ gint offset;
+ gchar *at_offset;
+ gunichar current;
+ gint len;
+
+ offset = begin_offset;
+ len = g_utf8_strlen (text, -1);
+
+ while (offset >= 0 && offset < len) {
+ at_offset = g_utf8_offset_to_pointer (text, offset);
+ current = g_utf8_get_char_validated (at_offset, -1);
+ if (current == '\n' || current == '\r')
+ break;
+ offset += step;
+ }
+
+ return offset;
}
static gchar *
@@ -310,9 +310,9 @@ et_get_text_after_offset (AtkText *text,
gint *start_offset,
gint *end_offset)
{
- gint start, end, len;
- const gchar *full_text = et_get_full_text (text);
- g_return_val_if_fail (full_text, NULL);
+ gint start, end, len;
+ const gchar *full_text = et_get_full_text (text);
+ g_return_val_if_fail (full_text, NULL);
switch (boundary_type)
{
@@ -364,8 +364,8 @@ et_get_text_at_offset (AtkText *text,
gint *end_offset)
{
gint start, end, len;
- const gchar *full_text = et_get_full_text (text);
- g_return_val_if_fail (full_text, NULL);
+ const gchar *full_text = et_get_full_text (text);
+ g_return_val_if_fail (full_text, NULL);
switch (boundary_type)
{
@@ -383,19 +383,19 @@ et_get_text_at_offset (AtkText *text,
break;
case ATK_TEXT_BOUNDARY_SENTENCE_START:
start = find_sentence_start (full_text, offset - 1, -1);
- end = find_sentence_start (full_text, offset, 1);
+ end = find_sentence_start (full_text, offset, 1);
break;
case ATK_TEXT_BOUNDARY_SENTENCE_END:
start = find_sentence_end (full_text, offset, -1);
- end = find_sentence_end (full_text, offset + 1, 1);
+ end = find_sentence_end (full_text, offset + 1, 1);
break;
case ATK_TEXT_BOUNDARY_LINE_START:
start = find_line_start (full_text, offset - 1, -1);
- end = find_line_start (full_text, offset, 1);
+ end = find_line_start (full_text, offset, 1);
break;
case ATK_TEXT_BOUNDARY_LINE_END:
start = find_line_end (full_text, offset, -1);
- end = find_line_end (full_text, offset + 1, 1);
+ end = find_line_end (full_text, offset + 1, 1);
break;
default:
return NULL;
@@ -427,9 +427,9 @@ et_get_text_before_offset (AtkText *text,
gint *start_offset,
gint *end_offset)
{
- gint start, end, len;
- const gchar *full_text = et_get_full_text (text);
- g_return_val_if_fail (full_text, NULL);
+ gint start, end, len;
+ const gchar *full_text = et_get_full_text (text);
+ g_return_val_if_fail (full_text, NULL);
switch (boundary_type)
{
@@ -451,15 +451,15 @@ et_get_text_before_offset (AtkText *text,
break;
case ATK_TEXT_BOUNDARY_SENTENCE_END:
end = find_sentence_end (full_text, offset, -1);
- start = find_sentence_end (full_text, end - 1, -1);
+ start = find_sentence_end (full_text, end - 1, -1);
break;
case ATK_TEXT_BOUNDARY_LINE_START:
end = find_line_start (full_text, offset, -1);
- start = find_line_start (full_text, end - 1, -1);
+ start = find_line_start (full_text, end - 1, -1);
break;
case ATK_TEXT_BOUNDARY_LINE_END:
end = find_line_end (full_text, offset, -1);
- start = find_line_end (full_text, end - 1, -1);
+ start = find_line_end (full_text, end - 1, -1);
break;
default:
return NULL;
@@ -518,24 +518,24 @@ et_get_character_extents (AtkText *text,
gint *height,
AtkCoordType coords)
{
- GObject *obj;
- EText *etext;
- GnomeCanvas *canvas;
- gint x_widget, y_widget, x_window, y_window;
- GdkWindow *window;
- GtkWidget *widget;
+ GObject *obj;
+ EText *etext;
+ GnomeCanvas *canvas;
+ gint x_widget, y_widget, x_window, y_window;
+ GdkWindow *window;
+ GtkWidget *widget;
PangoRectangle pango_pos;
- g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
- obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
- if (obj == NULL)
- return;
- g_return_if_fail (E_IS_TEXT (obj));
- etext = E_TEXT (obj);
- canvas = GNOME_CANVAS_ITEM (etext)->canvas;
- widget = GTK_WIDGET (canvas);
- window = gtk_widget_get_window (widget);
- gdk_window_get_origin (window, &x_widget, &y_widget);
+ g_return_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text));
+ obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
+ if (obj == NULL)
+ return;
+ g_return_if_fail (E_IS_TEXT (obj));
+ etext = E_TEXT (obj);
+ canvas = GNOME_CANVAS_ITEM (etext)->canvas;
+ widget = GTK_WIDGET (canvas);
+ window = gtk_widget_get_window (widget);
+ gdk_window_get_origin (window, &x_widget, &y_widget);
pango_layout_index_to_pos (etext->layout, offset, &pango_pos);
pango_pos.x = PANGO_PIXELS (pango_pos.x);
@@ -549,18 +549,18 @@ et_get_character_extents (AtkText *text,
*width = pango_pos.width;
*height = pango_pos.height;
- if (etext->draw_borders) {
+ if (etext->draw_borders) {
*x += 3; /*BORDER_INDENT;*/
*y += 3; /*BORDER_INDENT;*/
- }
+ }
*x += etext->xofs;
*y += etext->yofs;
- if (etext->editing) {
+ if (etext->editing) {
*x -= etext->xofs_edit;
*y -= etext->yofs_edit;
- }
+ }
*x += etext->cx;
*y += etext->cy;
@@ -595,23 +595,23 @@ et_get_offset_at_point (AtkText *text,
gint y,
AtkCoordType coords)
{
- GObject *obj;
- EText *etext;
- GnomeCanvas *canvas;
+ GObject *obj;
+ EText *etext;
+ GnomeCanvas *canvas;
gint x_widget, y_widget, x_window, y_window;
GdkWindow *window;
- GtkWidget *widget;
- gint index;
- gint trailing;
-
- g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), -1);
- obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
- if (obj == NULL)
- return -1;
- g_return_val_if_fail (E_IS_TEXT (obj), -1);
- etext = E_TEXT (obj);
- canvas = GNOME_CANVAS_ITEM (etext)->canvas;
- widget = GTK_WIDGET (canvas);
+ GtkWidget *widget;
+ gint index;
+ gint trailing;
+
+ g_return_val_if_fail (ATK_IS_GOBJECT_ACCESSIBLE (text), -1);
+ obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text));
+ if (obj == NULL)
+ return -1;
+ g_return_val_if_fail (E_IS_TEXT (obj), -1);
+ etext = E_TEXT (obj);
+ canvas = GNOME_CANVAS_ITEM (etext)->canvas;
+ widget = GTK_WIDGET (canvas);
window = gtk_widget_get_window (widget);
gdk_window_get_origin (window, &x_widget, &y_widget);
@@ -628,29 +628,29 @@ et_get_offset_at_point (AtkText *text,
else
return -1;
- if (etext->draw_borders) {
- x -= 3; /*BORDER_INDENT;*/
- y -= 3; /*BORDER_INDENT;*/
- }
+ if (etext->draw_borders) {
+ x -= 3; /*BORDER_INDENT;*/
+ y -= 3; /*BORDER_INDENT;*/
+ }
- x -= etext->xofs;
- y -= etext->yofs;
+ x -= etext->xofs;
+ y -= etext->yofs;
- if (etext->editing) {
- x += etext->xofs_edit;
- y += etext->yofs_edit;
- }
+ if (etext->editing) {
+ x += etext->xofs_edit;
+ y += etext->yofs_edit;
+ }
- x -= etext->cx;
- y -= etext->cy;
+ x -= etext->cx;
+ y -= etext->cy;
- pango_layout_xy_to_index (etext->layout,
+ pango_layout_xy_to_index (etext->layout,
x * PANGO_SCALE - PANGO_SCALE / 2,
y * PANGO_SCALE - PANGO_SCALE / 2,
&index,
&trailing);
- return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing);
+ return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing);
}
static gint
@@ -772,8 +772,8 @@ et_set_selection (AtkText *text,
return FALSE;
g_return_val_if_fail (E_IS_TEXT (obj), FALSE);
if (selection_num == 0)
- return et_add_selection (text, start_offset, end_offset);
- return FALSE;
+ return et_add_selection (text, start_offset, end_offset);
+ return FALSE;
}
static gboolean