From 3becce8cb1ea6e60397df8d17938154c199fb20d Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 11 Feb 2017 21:42:36 +0000 Subject: [PATCH] Pass canvas to nm_rstring --- similar/main/newmenu.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index 42daa6bc6..1ea49179f 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -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; }