gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for drawing underlined text. I also added a FIXME for the

Browse source 
* libnautilus-extensions/nautilus-scalable-font.c:
	(nautilus_text_layout_free), (nautilus_text_layout_new),
	(nautilus_text_layout_paint):
	* libnautilus-extensions/nautilus-scalable-font.h:
	Add support for drawing underlined text.  I also added a FIXME for
	the issue of hard coding the underline baseline rather than
	fetching the information from the rendred string.

	* test/test-nautilus-font.c: (main):
	Add underlined text test.
This commit is contained in:
Ramiro Estrugo 2000-09-07 11:43:20 +00:00
parent 897a33ffe9
commit 7525ad4146
6 changed files with 190 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,16 @@
2000-09-07 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_text_layout_free), (nautilus_text_layout_new),
(nautilus_text_layout_paint):
* libnautilus-extensions/nautilus-scalable-font.h:
Add support for drawing underlined text. I also added a FIXME for
the issue of hard coding the underline baseline rather than
fetching the information from the rendred string.
* test/test-nautilus-font.c: (main):
Add underlined text test.
2000-09-07 Ramiro Estrugo <ramiro@eazel.com>
* libnautilus-extensions/nautilus-scalable-font.c:
@ -7,7 +20,7 @@
(nautilus_scalable_font_draw_text_lines),
(nautilus_text_layout_paint):
* libnautilus-extensions/nautilus-scalable-font.h:
Add support for drawint inverted text. Also cleanup the rendering
Add support for drawing inverted text. Also cleanup the rendering
function a bit.
* libnautilus-extensions/nautilus-icon-factory.c: (embed_text):

104
libnautilus-extensions/nautilus-scalable-font.c
View file

@ -1440,11 +1440,11 @@ text_layout_free_row (gpointer data, gpointer user_data)
* freeing the structure yourself.
*/
void
nautilus_text_layout_free (NautilusTextLayout *text_info)
nautilus_text_layout_free (NautilusTextLayout *text_layout)
{
g_list_foreach (text_info->rows, text_layout_free_row, NULL);
g_list_free (text_info->rows);
g_free (text_info);
g_list_foreach (text_layout->rows, text_layout_free_row, NULL);
g_list_free (text_layout->rows);
g_free (text_layout);
}
/**
@ -1476,7 +1476,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
int max_width,
gboolean confine)
{
NautilusTextLayout *text_info;
NautilusTextLayout *text_layout;
NautilusTextLayoutRow *row;
const char *row_end;
const char *s, *word_start, *word_end, *old_word_end;
@ -1497,14 +1497,14 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
separators_len = strlen (separators);
text_info = g_new (NautilusTextLayout, 1);
text_layout = g_new (NautilusTextLayout, 1);
text_info->rows = NULL;
text_info->font = font;
text_info->font_size = font_size;
text_info->width = 0;
text_info->height = 0;
text_info->baseline_skip = font_size;
text_layout->rows = NULL;
text_layout->font = font;
text_layout->font_size = font_size;
text_layout->width = 0;
text_layout->height = 0;
text_layout->baseline_skip = font_size;
word_end = NULL;
@ -1566,12 +1566,12 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (row->text == NULL)
row->text = g_strdup("");
text_info->rows = g_list_append (text_info->rows, row);
text_layout->rows = g_list_append (text_layout->rows, row);
if (row->width > text_info->width)
text_info->width = row->width;
if (row->width > text_layout->width)
text_layout->width = row->width;
text_info->height += text_info->baseline_skip;
text_layout->height += text_layout->baseline_skip;
/* Bump the text pointer */
@ -1597,8 +1597,8 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (text_iter == row_end) {
/* We are on a newline, so append an empty row */
text_info->rows = g_list_append (text_info->rows, NULL);
text_info->height += text_info->baseline_skip / 2;
text_layout->rows = g_list_append (text_layout->rows, NULL);
text_layout->height += text_layout->baseline_skip / 2;
/* Next! */
@ -1621,12 +1621,12 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (row->text == NULL)
row->text = g_strdup("");
text_info->rows = g_list_append (text_info->rows, row);
text_layout->rows = g_list_append (text_layout->rows, row);
if (row->width > text_info->width)
text_info->width = row->width;
if (row->width > text_layout->width)
text_layout->width = row->width;
text_info->height += text_info->baseline_skip;
text_layout->height += text_layout->baseline_skip;
/* Next! */
@ -1634,7 +1634,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
}
}
return text_info;
return text_layout;
}
/**
@ -1651,63 +1651,83 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
* rendering functions.
*/
void
nautilus_text_layout_paint (const NautilusTextLayout *text_info,
GdkPixbuf *destination_pixbuf,
int x,
int y,
GtkJustification just,
guint32 color,
gboolean inverted)
nautilus_text_layout_paint (const NautilusTextLayout *text_layout,
GdkPixbuf *destination_pixbuf,
int x,
int y,
GtkJustification justification,
guint32 color,
gboolean inverted,
gboolean underlined)
{
GList *item;
const NautilusTextLayoutRow *row;
int xpos;
g_return_if_fail (text_info != NULL);
g_return_if_fail (text_layout != NULL);
g_return_if_fail (destination_pixbuf != NULL);
g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
/* y += text_info->font->ascent; */
/* y += text_layout->font->ascent; */
for (item = text_info->rows; item; item = item->next) {
for (item = text_layout->rows; item; item = item->next) {
if (item->data) {
row = item->data;
switch (just) {
switch (justification) {
case GTK_JUSTIFY_LEFT:
xpos = 0;
break;
case GTK_JUSTIFY_RIGHT:
xpos = text_info->width - row->width;
xpos = text_layout->width - row->width;
break;
case GTK_JUSTIFY_CENTER:
xpos = (text_info->width - row->width) / 2;
xpos = (text_layout->width - row->width) / 2;
break;
default:
/* Anyone care to implement GTK_JUSTIFY_FILL? */
g_warning ("Justification type %d not supported. Using left-justification.",
(int) just);
(int) justification);
xpos = 0;
}
nautilus_scalable_font_draw_text (text_info->font,
nautilus_scalable_font_draw_text (text_layout->font,
destination_pixbuf,
x + xpos,
y,
NULL,
text_info->font_size,
text_info->font_size,
text_layout->font_size,
text_layout->font_size,
row->text,
row->text_length,
color,
255,
inverted);
y += text_info->baseline_skip;
/* Underline the text if needed */
if (underlined) {
GdkRectangle underline_rect;
/* FIXME bugzilla.eazel.com 2865: This underlining code should
* take into account the baseline for the rendered string rather
* that doing the '-2' nonsense.
*/
underline_rect.x = x + xpos;
underline_rect.y = y + text_layout->font_size - 2;
underline_rect.width = row->width;
underline_rect.height = 1;
nautilus_gdk_pixbuf_fill_rectangle_with_color (destination_pixbuf,
&underline_rect,
color);
}
y += text_layout->baseline_skip;
} else
y += text_info->baseline_skip / 2;
y += text_layout->baseline_skip / 2;
}
}

3
libnautilus-extensions/nautilus-scalable-font.h
View file

@ -200,7 +200,8 @@ void nautilus_text_layout_paint (const NautilusTextLayout *text
int y,
GtkJustification just,
guint32 color,
gboolean inverted);
gboolean inverted,
gboolean underlined);
void nautilus_text_layout_free (NautilusTextLayout *text_info);

104
libnautilus-private/nautilus-scalable-font.c
View file

@ -1440,11 +1440,11 @@ text_layout_free_row (gpointer data, gpointer user_data)
* freeing the structure yourself.
*/
void
nautilus_text_layout_free (NautilusTextLayout *text_info)
nautilus_text_layout_free (NautilusTextLayout *text_layout)
{
g_list_foreach (text_info->rows, text_layout_free_row, NULL);
g_list_free (text_info->rows);
g_free (text_info);
g_list_foreach (text_layout->rows, text_layout_free_row, NULL);
g_list_free (text_layout->rows);
g_free (text_layout);
}
/**
@ -1476,7 +1476,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
int max_width,
gboolean confine)
{
NautilusTextLayout *text_info;
NautilusTextLayout *text_layout;
NautilusTextLayoutRow *row;
const char *row_end;
const char *s, *word_start, *word_end, *old_word_end;
@ -1497,14 +1497,14 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
separators_len = strlen (separators);
text_info = g_new (NautilusTextLayout, 1);
text_layout = g_new (NautilusTextLayout, 1);
text_info->rows = NULL;
text_info->font = font;
text_info->font_size = font_size;
text_info->width = 0;
text_info->height = 0;
text_info->baseline_skip = font_size;
text_layout->rows = NULL;
text_layout->font = font;
text_layout->font_size = font_size;
text_layout->width = 0;
text_layout->height = 0;
text_layout->baseline_skip = font_size;
word_end = NULL;
@ -1566,12 +1566,12 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (row->text == NULL)
row->text = g_strdup("");
text_info->rows = g_list_append (text_info->rows, row);
text_layout->rows = g_list_append (text_layout->rows, row);
if (row->width > text_info->width)
text_info->width = row->width;
if (row->width > text_layout->width)
text_layout->width = row->width;
text_info->height += text_info->baseline_skip;
text_layout->height += text_layout->baseline_skip;
/* Bump the text pointer */
@ -1597,8 +1597,8 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (text_iter == row_end) {
/* We are on a newline, so append an empty row */
text_info->rows = g_list_append (text_info->rows, NULL);
text_info->height += text_info->baseline_skip / 2;
text_layout->rows = g_list_append (text_layout->rows, NULL);
text_layout->height += text_layout->baseline_skip / 2;
/* Next! */
@ -1621,12 +1621,12 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
if (row->text == NULL)
row->text = g_strdup("");
text_info->rows = g_list_append (text_info->rows, row);
text_layout->rows = g_list_append (text_layout->rows, row);
if (row->width > text_info->width)
text_info->width = row->width;
if (row->width > text_layout->width)
text_layout->width = row->width;
text_info->height += text_info->baseline_skip;
text_layout->height += text_layout->baseline_skip;
/* Next! */
@ -1634,7 +1634,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
}
}
return text_info;
return text_layout;
}
/**
@ -1651,63 +1651,83 @@ nautilus_text_layout_new (const NautilusScalableFont *font,
* rendering functions.
*/
void
nautilus_text_layout_paint (const NautilusTextLayout *text_info,
GdkPixbuf *destination_pixbuf,
int x,
int y,
GtkJustification just,
guint32 color,
gboolean inverted)
nautilus_text_layout_paint (const NautilusTextLayout *text_layout,
GdkPixbuf *destination_pixbuf,
int x,
int y,
GtkJustification justification,
guint32 color,
gboolean inverted,
gboolean underlined)
{
GList *item;
const NautilusTextLayoutRow *row;
int xpos;
g_return_if_fail (text_info != NULL);
g_return_if_fail (text_layout != NULL);
g_return_if_fail (destination_pixbuf != NULL);
g_return_if_fail (justification >= GTK_JUSTIFY_LEFT && justification <= GTK_JUSTIFY_FILL);
/* y += text_info->font->ascent; */
/* y += text_layout->font->ascent; */
for (item = text_info->rows; item; item = item->next) {
for (item = text_layout->rows; item; item = item->next) {
if (item->data) {
row = item->data;
switch (just) {
switch (justification) {
case GTK_JUSTIFY_LEFT:
xpos = 0;
break;
case GTK_JUSTIFY_RIGHT:
xpos = text_info->width - row->width;
xpos = text_layout->width - row->width;
break;
case GTK_JUSTIFY_CENTER:
xpos = (text_info->width - row->width) / 2;
xpos = (text_layout->width - row->width) / 2;
break;
default:
/* Anyone care to implement GTK_JUSTIFY_FILL? */
g_warning ("Justification type %d not supported. Using left-justification.",
(int) just);
(int) justification);
xpos = 0;
}
nautilus_scalable_font_draw_text (text_info->font,
nautilus_scalable_font_draw_text (text_layout->font,
destination_pixbuf,
x + xpos,
y,
NULL,
text_info->font_size,
text_info->font_size,
text_layout->font_size,
text_layout->font_size,
row->text,
row->text_length,
color,
255,
inverted);
y += text_info->baseline_skip;
/* Underline the text if needed */
if (underlined) {
GdkRectangle underline_rect;
/* FIXME bugzilla.eazel.com 2865: This underlining code should
* take into account the baseline for the rendered string rather
* that doing the '-2' nonsense.
*/
underline_rect.x = x + xpos;
underline_rect.y = y + text_layout->font_size - 2;
underline_rect.width = row->width;
underline_rect.height = 1;
nautilus_gdk_pixbuf_fill_rectangle_with_color (destination_pixbuf,
&underline_rect,
color);
}
y += text_layout->baseline_skip;
} else
y += text_info->baseline_skip / 2;
y += text_layout->baseline_skip / 2;
}
}

3
libnautilus-private/nautilus-scalable-font.h
View file

@ -200,7 +200,8 @@ void nautilus_text_layout_paint (const NautilusTextLayout *text
int y,
GtkJustification just,
guint32 color,
gboolean inverted);
gboolean inverted,
gboolean underlined);
void nautilus_text_layout_free (NautilusTextLayout *text_info);

55
test/test-nautilus-font.c
View file

@ -280,20 +280,20 @@ main (int argc, char* argv[])
* Text layout test.
*/
{
NautilusTextLayout *text_info;
NautilusTextLayout *text_layout;
const guint max_text_width = 100;
const char *separators = " -_,;.?/&";
const char *text = "This is a long piece of text!-This is the second piece-Now we have the third piece-And finally the fourth piece";
const guint font_size = 14;
ArtIRect layout_area;
text_info = nautilus_text_layout_new (font,
text_layout = nautilus_text_layout_new (font,
font_size,
text,
separators,
max_text_width,
TRUE);
g_assert (text_info != NULL);
g_assert (text_layout != NULL);
layout_area.x0 = 20;
layout_area.y0 = 550;
@ -302,12 +302,13 @@ main (int argc, char* argv[])
draw_rectangle_around (pixbuf, &layout_area, RED);
nautilus_text_layout_paint (text_info,
nautilus_text_layout_paint (text_layout,
pixbuf,
layout_area.x0,
layout_area.y0,
GTK_JUSTIFY_LEFT,
BLACK,
FALSE,
FALSE);
layout_area.x0 += (max_text_width + 20);
@ -315,12 +316,13 @@ main (int argc, char* argv[])
draw_rectangle_around (pixbuf, &layout_area, RED);
nautilus_text_layout_paint (text_info,
nautilus_text_layout_paint (text_layout,
pixbuf,
layout_area.x0,
layout_area.y0,
GTK_JUSTIFY_CENTER,
BLACK,
FALSE,
FALSE);
layout_area.x0 += (max_text_width + 20);
@ -328,15 +330,54 @@ main (int argc, char* argv[])
draw_rectangle_around (pixbuf, &layout_area, RED);
nautilus_text_layout_paint (text_info,
nautilus_text_layout_paint (text_layout,
pixbuf,
layout_area.x0,
layout_area.y0,
GTK_JUSTIFY_RIGHT,
BLACK,
FALSE,
FALSE);
nautilus_text_layout_free (text_info);
nautilus_text_layout_free (text_layout);
}
/*
* Underlined text test.
*/
{
NautilusTextLayout *text_layout;
const guint max_text_width = pixbuf_width / 2;
const char *separators = "-";
const char *text = "This is multi line-text (g) that should-be centered and-(q) underlined";
const guint font_size = 30;
ArtIRect layout_area;
text_layout = nautilus_text_layout_new (font,
font_size,
text,
separators,
max_text_width,
TRUE);
g_assert (text_layout != NULL);
layout_area.x0 = (pixbuf_width - text_layout->width) / 2;
layout_area.y0 = 410;
layout_area.x1 = layout_area.x0 + text_layout->width;
layout_area.y1 = layout_area.y0 + text_layout->height;
draw_rectangle_around (pixbuf, &layout_area, RED);
nautilus_text_layout_paint (text_layout,
pixbuf,
layout_area.x0,
layout_area.y0,
GTK_JUSTIFY_CENTER,
BLACK,
FALSE,
TRUE);
nautilus_text_layout_free (text_layout);
}
nautilus_gdk_pixbuf_save_to_file (pixbuf, "font_test.png");