diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-11-08 18:46:57 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-11-08 18:46:57 +0300 |
| commit | 061cde65a63bc8bb74ba1d003e7c75ea556eba55 (patch) | |
| tree | e9700377b9c3e1d03f02f8eb6d2e9f33f83599be /source/blender/src/interface_draw.c | |
| parent | 5bba5035b0eefdf777574b8c7af323d8d6ff7a2e (diff) | |
To end the issues with AA (International) Fonts; the .bfont.tff now is
compiled in (datatoc) and doesn't need installation anymore.
Also reviewed weird path conventions for searching AA fonts;
- U.fontdir is only used as standard search path for fileselecting
- U.fontname stores only full path to AA font if used one
- If a font cannot be found, it always falls back to the compiled in one
- If .B.blend is saved with default font, U.fontname is not set
Also added a button in usermenu "restore default".
When this works as expected, I'll commit changes for installation too.
Diffstat (limited to 'source/blender/src/interface_draw.c')
| -rw-r--r-- | source/blender/src/interface_draw.c | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index 3899d9ed101..220b11e2cee 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -446,29 +446,32 @@ static void ui_default_menu_arrows(float x1, float y1, float x2, float y2) /* left/right arrows for number fields */ static void ui_default_num_arrows(float x1, float y1, float x2, float y2) { - glEnable( GL_POLYGON_SMOOTH ); - glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - - glShadeModel(GL_FLAT); - glBegin(GL_TRIANGLES); - - glVertex2f((short)x1+5,(short)(y2-(y2-y1)/2)); - glVertex2f((short)x1+10,(short)(y2-(y2-y1)/2)+4); - glVertex2f((short)x1+10,(short)(y2-(y2-y1)/2)-4); - glEnd(); + if( x2-x1 > 25) { // 25 is a bit arbitrary, but small buttons cant have arrows - /* right */ - glShadeModel(GL_FLAT); - glBegin(GL_TRIANGLES); + glEnable( GL_POLYGON_SMOOTH ); + glEnable( GL_BLEND ); + glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + + glShadeModel(GL_FLAT); + glBegin(GL_TRIANGLES); + + glVertex2f((short)x1+5,(short)(y2-(y2-y1)/2)); + glVertex2f((short)x1+10,(short)(y2-(y2-y1)/2)+4); + glVertex2f((short)x1+10,(short)(y2-(y2-y1)/2)-4); + glEnd(); - glVertex2f((short)x2-5,(short)(y2-(y2-y1)/2)); - glVertex2f((short)x2-10,(short)(y2-(y2-y1)/2)-4); - glVertex2f((short)x2-10,(short)(y2-(y2-y1)/2)+4); - glEnd(); - - glDisable( GL_BLEND ); - glDisable( GL_POLYGON_SMOOTH ); + /* right */ + glShadeModel(GL_FLAT); + glBegin(GL_TRIANGLES); + + glVertex2f((short)x2-5,(short)(y2-(y2-y1)/2)); + glVertex2f((short)x2-10,(short)(y2-(y2-y1)/2)-4); + glVertex2f((short)x2-10,(short)(y2-(y2-y1)/2)+4); + glEnd(); + + glDisable( GL_BLEND ); + glDisable( GL_POLYGON_SMOOTH ); + } } /* changing black/white for TOG3 buts */ |