sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- name of marker is printed only when strlen(marker->name) is bigger then

Browse Source 
zero
 - bug fix (feature request): name of marker isn't pushed out of window,
   when timeline window isn't very high (thanks Matt for bug report)
This commit is contained in:
Jiri Hnidek 2005-09-20 16:36:07 +00:00
parent bb59977d79
commit ff22c1de20
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/src/drawtime.c
View File

@ -32,6 +32,7 @@
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -148,19 +149,22 @@ static void draw_marker(TimeMarker *marker)
glDisable(GL_BLEND); glDisable(GL_BLEND);
/* and the marker name too, shifted slightly to the top-right */ /* and the marker name too, shifted slightly to the top-right */
if(marker->flag & SELECT) { if(strlen(marker->name)>0) {
BIF_ThemeColor(TH_TEXT_HI); if(marker->flag & SELECT) {
glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 27.0*yspace/ypixels); BIF_ThemeColor(TH_TEXT_HI);
glRasterPos2f(xpos+(4.0*(xspace/xpixels)),
((ypixels<=39.0)?(ypixels-10.0):29.0)*yspace/ypixels);
}
else {
BIF_ThemeColor(TH_TEXT);
if((marker->frame <= G.scene->r.cfra) && (marker->frame+5 > G.scene->r.cfra))
glRasterPos2f(xpos+(4.0*(xspace/xpixels)),
((ypixels<=39.0)?(ypixels-10.0):29.0)*yspace/ypixels);
else
glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 17.0*yspace/ypixels);
}
BMF_DrawString(G.font, marker->name);
} }
else {
BIF_ThemeColor(TH_TEXT);
if((marker->frame <= G.scene->r.cfra) && (marker->frame+5 > G.scene->r.cfra))
glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 27.0*yspace/ypixels);
else
glRasterPos2f(xpos+(4.0*(xspace/xpixels)), 17.0*yspace/ypixels);
}
BMF_DrawString(G.font, marker->name);
} }
static void draw_markers_time(SpaceTime *stime) static void draw_markers_time(SpaceTime *stime)