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

Pass canvas to nm_rstring

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:36 +00:00
parent fbc16efa0f
commit 3becce8cb1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
similar/main/newmenu.cpp
View file

@ -316,14 +316,14 @@ static void nm_string_black( int w1,int x, int y, const char * s )
// Draw a right justfied string
static void nm_rstring( int w1,int x, int y, const char * s )
static void nm_rstring(grs_canvas &canvas, int w1, int x, const int y, const char *const s)
{
int w, h;
gr_get_string_size(*grd_curcanv->cv_font, s, &w, &h, nullptr);
gr_get_string_size(*canvas.cv_font, s, &w, &h, nullptr);
x -= FSPACX(3);
if (w1 == 0) w1 = w;
gr_string(*grd_curcanv, x - w, y, s, w, h);
gr_string(canvas, x - w, y, s, w, h);
}
static void nm_string_inputbox( int w, int x, int y, const char * text, int current )
@ -404,11 +404,11 @@ static void draw_item( newmenu_item *item, int is_current, int tiny, int tabs_fl
break;
case NM_TYPE_CHECK:
nm_string(*grd_curcanv, item->w, item->x, item->y - (line_spacing * scroll_offset), item->text, tabs_flag);
nm_rstring(item->right_offset, item->x, item->y - (line_spacing * scroll_offset), item->value ? CHECKED_CHECK_BOX : NORMAL_CHECK_BOX);
nm_rstring(*grd_curcanv, item->right_offset, item->x, item->y - (line_spacing * scroll_offset), item->value ? CHECKED_CHECK_BOX : NORMAL_CHECK_BOX);
break;
case NM_TYPE_RADIO:
nm_string(*grd_curcanv, item->w, item->x, item->y - (line_spacing * scroll_offset), item->text, tabs_flag);
nm_rstring(item->right_offset, item->x, item->y - (line_spacing * scroll_offset), item->value ? CHECKED_RADIO_BOX : NORMAL_RADIO_BOX);
nm_rstring(*grd_curcanv, item->right_offset, item->x, item->y - (line_spacing * scroll_offset), item->value ? CHECKED_RADIO_BOX : NORMAL_RADIO_BOX);
break;
case NM_TYPE_NUMBER:
{
@ -420,7 +420,7 @@ static void draw_item( newmenu_item *item, int is_current, int tiny, int tabs_fl
item->value = number.max_value;
nm_string(*grd_curcanv, item->w, item->x, item->y - (line_spacing * scroll_offset), item->text, tabs_flag);
snprintf(text, sizeof(text), "%d", item->value );
nm_rstring(item->right_offset,item->x, item->y - (line_spacing * scroll_offset), text);
nm_rstring(*grd_curcanv, item->right_offset, item->x, item->y - (line_spacing * scroll_offset), text);
}
break;
}