dia r4198 - in trunk: . lib

[hans svn gnome org]

Author: hans
Date: Sat Jan 17 16:19:10 2009
New Revision: 4198
URL: http://svn.gnome.org/viewvc/dia?rev=4198&view=rev

Log:
2009-01-17  Hans Breuer  <hans breuer org>

	* lib/text.c : improved algorithm for bounding box calculation with 
	better understanding of the ascent/descent/font-height relation.
	Fixes bug #567556 without reopening bug #528642.



Modified:
   trunk/ChangeLog
   trunk/lib/text.c

Modified: trunk/lib/text.c
==============================================================================
--- trunk/lib/text.c	(original)
+++ trunk/lib/text.c	Sat Jan 17 16:19:10 2009
@@ -421,7 +421,7 @@
   box->bottom = box->top + text->height*text->numlines + text->descent;
 #else
   /* why should we add one descent? isn't ascent+descent~=height? */
-  box->bottom = box->top + (text->ascent+text->descent)*text->numlines;
+  box->bottom = box->top + (text->ascent+text->descent+text->height*(text->numlines-1));
 #endif
   if (text->focus.has_focus) {
     real height = text->ascent + text->descent;