dia r3998 - in trunk: . lib

[hans svn gnome org]

Author: hans
Date: Sat May 10 10:50:29 2008
New Revision: 3998
URL: http://svn.gnome.org/viewvc/dia?rev=3998&view=rev

Log:
2008-05-10  Hans Breuer  <hans breuer org>

	* lib/text.c(text_calc_boundingbox) : the bounding box did include one
	descent too much, which caused wrong placement for "Standard - Text"
	which calculates the vertical text positioning from the bounding box.
	Fixes bug #528642 but not bug #438020.


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

Modified: trunk/lib/text.c
==============================================================================
--- trunk/lib/text.c	(original)
+++ trunk/lib/text.c	Sat May 10 10:50:29 2008
@@ -417,9 +417,12 @@
   box->right = box->left + text->max_width;
   
   box->top = text->position.y - text->ascent;
-
+#if 0
   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;
+#endif
   if (text->focus.has_focus) {
     real height = text->ascent + text->descent;
     if (text->cursor_pos == 0) {