archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

python API: added support for screen font 12(fix-width) as "normalfix"

Browse Source
This commit is contained in:
Remigiusz Fiedler
2008-02-19 10:47:29 +00:00
parent 92300016e0
commit 0d80e08e8a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/python/api2_2x/Draw.c
View File

@@ -284,12 +284,12 @@ new String button\n\n\
static char Method_GetStringWidth_doc[] =
"(text, font = 'normal') - Return the width in pixels of the given string\n\
(font) The font size: 'normal' (default), 'small' or 'tiny'.";
(font) The font size: 'large','normal' (default), 'normalfix', 'small' or 'tiny'.";
static char Method_Text_doc[] =
"(text, font = 'normal') - Draw text onscreen\n\n\
(text) The text to draw\n\
(font) The font size: 'normal' (default), 'small' or 'tiny'.\n\n\
(font) The font size: 'large','normal' (default), 'normalfix', 'small' or 'tiny'.\n\n\
This function returns the width of the drawn string.";
static char Method_Label_doc[] =
@@ -1641,6 +1641,8 @@ static PyObject *Method_GetStringWidth( PyObject * self, PyObject * args )
if( !strcmp( font_str, "normal" ) )
font = ( &G )->font;
else if( !strcmp( font_str, "normalfix" ) )
font = BMF_GetFont(BMF_kScreen12);
else if( !strcmp( font_str, "large" ) )
font = BMF_GetFont(BMF_kScreen15);
else if( !strcmp( font_str, "small" ) )
@@ -1649,7 +1651,7 @@ static PyObject *Method_GetStringWidth( PyObject * self, PyObject * args )
font = ( &G )->fontss;
else
return EXPP_ReturnPyObjError( PyExc_AttributeError,
"\"font\" must be: 'large', 'normal' (default), 'small' or 'tiny'." );
"\"font\" must be: 'large','normal' (default), 'normalfix', 'small' or 'tiny'." );
width = PyInt_FromLong( BMF_GetStringWidth( font, text ) );
@@ -1674,6 +1676,8 @@ static PyObject *Method_Text( PyObject * self, PyObject * args )
font = ( &G )->font;
else if( !strcmp( font_str, "large" ) )
font = BMF_GetFont(BMF_kScreen15);
else if( !strcmp( font_str, "normalfix" ) )
font = BMF_GetFont(BMF_kScreen12);
else if( !strcmp( font_str, "normal" ) )
font = ( &G )->font;
else if( !strcmp( font_str, "small" ) )
@@ -1682,7 +1686,7 @@ static PyObject *Method_Text( PyObject * self, PyObject * args )
font = ( &G )->fontss;
else
return EXPP_ReturnPyObjError( PyExc_AttributeError,
"\"font\" must be: 'normal' (default), 'large', 'small' or 'tiny'." );
"\"font\" must be: 'large','normal' (default), 'normalfix', 'small' or 'tiny'." );
BMF_DrawString( font, text );

4
source/blender/python/api2_2x/doc/Draw.py
View File

@@ -786,7 +786,7 @@ def GetStringWidth(string, fontsize = 'normal'):
@type string: string
@param string: A string.
@type fontsize: string
@param fontsize: The size of the font: 'large', 'normal', 'small' or 'tiny'.
@param fontsize: The size of the font: 'large', 'normal', 'normalfix', 'small' or 'tiny'.
@rtype: int
@return: The width of I{string} with the chosen I{fontsize}.
"""
@@ -803,7 +803,7 @@ def Text(string, fontsize = 'normal'):
@type string: string
@param string: The text string to draw.
@type fontsize: string
@param fontsize: The size of the font: 'large', 'normal', 'small' or 'tiny'.
@param fontsize: The size of the font: 'large', 'normal', 'normalfix', 'small' or 'tiny'.
@rtype: int
@return: The width of I{string} drawn with the chosen I{fontsize}.
@note: For drawing text in the 3d view see the workaround in L{BGL.glRasterPos}