[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26131] trunk/blender/source/blender/ editors/interface/interface_regions.c: Fix [#20739] zooming error for hint messages

[Matt Ebb]

Revision: 26131
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26131
Author:   broken
Date:     2010-01-20 07:47:47 +0100 (Wed, 20 Jan 2010)

Log Message:
-----------
Fix [#20739] zooming error for hint messages

Don't scale down text in tooltips, more readable this way anyway.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2010-01-20 05:41:59 UTC (rev 26130)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2010-01-20 06:47:47 UTC (rev 26131)
@@ -435,7 +435,6 @@
 	/* set font, get bb */
 	data->fstyle= style->widget; /* copy struct */
 	data->fstyle.align= UI_STYLE_TEXT_CENTER;
-	ui_fontscale(&data->fstyle.points, aspect);
 	uiStyleFontSet(&data->fstyle);
 
 	h= BLF_height(data->lines[0]);
@@ -447,13 +446,12 @@
 	}
 
 	fontw *= aspect;
-	fonth *= aspect;
 
 	ar->regiondata= data;
 
 	data->toth= fonth;
-	data->lineh= h*aspect;
-	data->spaceh= 5*aspect;
+	data->lineh= h;
+	data->spaceh= 5;
 
 	/* compute position */
 	ofsx= (but->block->panel)? but->block->panel->ofsx: 0;
@@ -462,7 +460,7 @@
 	x1f= (but->x1+but->x2)/2.0f + ofsx - 16.0f*aspect;
 	x2f= x1f + fontw + 16.0f*aspect;
 	y2f= but->y1 + ofsy - 15.0f*aspect;
-	y1f= y2f - fonth - 10.0f*aspect;
+	y1f= y2f - fonth*aspect - 15.0f*aspect;
 	
 	/* copy to int, gets projected if possible too */
 	x1= x1f; y1= y1f; x2= x2f; y2= y2f; 
@@ -494,8 +492,8 @@
 		}
 	}
 	if(y1 < 0) {
-		y1 += 56*aspect;
-		y2 += 56*aspect;
+		y1 += 56;
+		y2 += 56;
 	}
 
 	/* widget rect, in region coords */