luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remote changes at Thu Aug 17 15:42:31 EDT 2017 by chuan on vivaldi

This commit is contained in:
Chuan Chen 2017-08-17 15:42:31 -04:00
parent 40d9a5a9c8
commit 17e387bfa2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/grTCairo3.c
View File

@ -169,7 +169,7 @@ grtcairoSetCharSize (size)
int size; /* Width of characters, in pixels (6 or 8). */ int size; /* Width of characters, in pixels (6 or 8). */
{ {
tcairoCurrent.fontSize = size; tcairoCurrent.fontSize = size;
cairo_set_font_size(grCairoContext, size); cairo_set_font_size(grCairoContext, size*4+10);
switch (size) switch (size)
{ {
case GR_TEXT_DEFAULT: case GR_TEXT_DEFAULT:
@ -638,6 +638,7 @@ int pixsize;
cairo_line_to(grCairoContext, tp[0].p_x, tp[0].p_y); cairo_line_to(grCairoContext, tp[0].p_x, tp[0].p_y);
} }
} }
cairo_fill(grCairoContext);
/* /*
if (tess == NULL) if (tess == NULL)
@ -729,7 +730,7 @@ LinkedRect *obscure; /* List of obscuring areas */
glRotated(rotate, 0, 0, 1); glRotated(rotate, 0, 0, 1);
*/ */
// how to replace glPushMatrix??? cairo_save(grCairoContext);
cairo_translate(grCairoContext, pos->p_x, pos->p_y); cairo_translate(grCairoContext, pos->p_x, pos->p_y);
cairo_rotate(grCairoContext, ((double)angle) / 360 * 2 * M_PI); cairo_rotate(grCairoContext, ((double)angle) / 360 * 2 * M_PI);
@ -760,6 +761,7 @@ LinkedRect *obscure; /* List of obscuring areas */
cairo_translate(grCairoContext, coffset->p_x, coffset->p_y); cairo_translate(grCairoContext, coffset->p_x, coffset->p_y);
} }
//glPopMatrix(); //glPopMatrix();
cairo_restore(grCairoContext);
} }
#endif /* VECTOR_FONTS */ #endif /* VECTOR_FONTS */
@ -826,6 +828,7 @@ LinkedRect *obscure; /* A list of obscuring rectangles */
{ {
//glScissor(overlap.r_xbot, overlap.r_ybot, overlap.r_xtop - overlap.r_xbot, //glScissor(overlap.r_xbot, overlap.r_ybot, overlap.r_xtop - overlap.r_xbot,
// overlap.r_ytop - overlap.r_ybot); // overlap.r_ytop - overlap.r_ybot);
cairo_rectangle(grCairoContext, overlap.r_xbot, overlap.r_ybot, overlap.r_xtop - overlap.r_xbot, overlap.r_ytop - overlap.r_ybot);
cairo_clip(grCairoContext); cairo_clip(grCairoContext);
/* /*
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
@ -838,6 +841,7 @@ LinkedRect *obscure; /* A list of obscuring rectangles */
*/ */
cairo_move_to(grCairoContext, location.r_xbot, location.r_ybot); cairo_move_to(grCairoContext, location.r_xbot, location.r_ybot);
cairo_show_text(grCairoContext, text); cairo_show_text(grCairoContext, text);
cairo_fill(grCairoContext);
} }
} }