TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Inline gr_set_fontcolor

Browse source 
It is a trivial function.
This commit is contained in:
Kp 2020-07-05 23:34:32 +00:00
parent b39c7c4ed2
commit 7a790f6068
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/include/fwd-gr.h
View file

@ -282,7 +282,6 @@ namespace dcx {
//remap (by re-reading) all the color fonts
void gr_remap_color_fonts();
void gr_set_curfont(grs_canvas &, const grs_font *);
void gr_set_fontcolor(grs_canvas &, int fg_color, int bg_color);
void gr_string(grs_canvas &, const grs_font &, int x, int y, const char *s, int w, int h);
void gr_string(grs_canvas &, const grs_font &, int x, int y, const char *s);
void gr_ustring(grs_canvas &, const grs_font &, int x, int y, const char *s);

18
common/include/gr.h
View file

@ -299,6 +299,24 @@ static inline void gr_set_transparent(grs_bitmap &bm, bool bTransparent)
}
namespace dcx {
static inline void gr_set_font_fg_color(grs_canvas &canvas, int fg_color)
{
canvas.cv_font_fg_color = fg_color;
}
static inline void gr_set_font_bg_color(grs_canvas &canvas, int bg_color)
{
canvas.cv_font_bg_color = bg_color;
}
#define gr_set_fontcolor(C,F,B) \
( DXX_BEGIN_COMPOUND_STATEMENT { \
auto &gr_set_fontcolor = C; \
gr_set_font_fg_color(gr_set_fontcolor, F); \
gr_set_font_bg_color(gr_set_fontcolor, B); \
} DXX_END_COMPOUND_STATEMENT )
struct font_delete
{
void operator()(grs_font *p) const

6
similar/2d/font.cpp
View file

@ -1077,12 +1077,6 @@ void gr_set_curfont(grs_canvas &canvas, const grs_font *n)
canvas.cv_font = n;
}
void gr_set_fontcolor(grs_canvas &canvas, const int fg_color, const int bg_color)
{
canvas.cv_font_fg_color = fg_color;
canvas.cv_font_bg_color = bg_color;
}
template <bool masked_draws_background>
static int gr_internal_string_clipped_template(grs_canvas &canvas, const grs_font &cv_font, int x, int y, const char *const s)
{