dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make text align correctly if text-box is FIXED. 

2008-08-15  Daniel Eddeland  <danedde@svn.gnome.org>

	* app/text/gimptextlayout-render.c: make text align correctly if
	text-box is FIXED.


svn path=/trunk/; revision=26580
This commit is contained in:
Daniel Eddeland 2008-08-15 19:31:09 +00:00 committed by Daniel Eddeland
parent d32b325567
commit 55a9b2beb1
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-08-15 Daniel Eddeland <danedde@svn.gnome.org>
* app/text/gimptextlayout-render.c: make text align correctly if
text-box is FIXED.
2008-08-15 Michael Natterer <mitch@gimp.org>
* app/paint/gimppaintcore-stroke.c

18
app/text/gimptextlayout-render.c
View File

@ -73,6 +73,7 @@ gimp_text_layout_render (GimpTextLayout *layout,
gpointer render_data)
{
PangoLayoutIter *iter;
PangoRectangle rect;
gint x, y;
g_return_if_fail (GIMP_IS_TEXT_LAYOUT (layout));
@ -83,11 +84,26 @@ gimp_text_layout_render (GimpTextLayout *layout,
x *= PANGO_SCALE;
y *= PANGO_SCALE;
pango_layout_get_extents (layout->layout, NULL, &rect);
/* If the width of the layout is > 0, then the text-box is FIXED
* and the layout position should be offset if the alignment
* is centered or right-aligned*/
if (pango_layout_get_width (layout->layout) > 0)
switch (pango_layout_get_alignment (layout->layout))
{
case PANGO_ALIGN_RIGHT:
x += pango_layout_get_width (layout->layout) - rect.width;
break;
case PANGO_ALIGN_CENTER:
x += (pango_layout_get_width (layout->layout) - rect.width) / 2;
break;
}
iter = pango_layout_get_iter (layout->layout);
do
{
PangoRectangle rect;
PangoLayoutLine *line;
gint baseline;