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

Pass canvas to Hline

Browse source
This commit is contained in:
Kp 2017-02-11 21:42:35 +00:00
parent 13320c8011
commit f9cb598b0f
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/ui.h
View file

@ -254,9 +254,9 @@ extern grs_font_ptr ui_small_font;
extern unsigned char CBLACK,CGREY,CWHITE,CBRIGHT,CRED;
extern UI_GADGET * selected_gadget;
#define Hline(x1,x2,y,c) Hline(x1,y,x2,c)
#define Hline(C,x1,x2,y,c) Hline(C,x1,y,x2,c)
#define Vline(y1,y2,x,c) Vline(x,y1,y2,c)
void Hline(short x1, short x2, short y, uint8_t color);
void Hline(grs_canvas &, fix x1, fix x2, fix y, uint8_t color);
void Vline(short y1, short y2, short x, uint8_t color);
extern void ui_string_centered( short x, short y, const char * s );
extern void ui_draw_box_out( short x1, short y1, short x2, short y2 );

4
common/ui/listbox.cpp
View file

@ -107,10 +107,10 @@ static void gr_draw_sunken_border( short x1, short y1, short x2, short y2 )
{
const uint8_t cgrey = CGREY;
const uint8_t cbright = CBRIGHT;
Hline(x1-1, x2+1, y1-1, cgrey);
Hline(*grd_curcanv, x1 - 1, x2 + 1, y1 - 1, cgrey);
Vline( y1-1, y2+1, x1-1, cgrey);
Hline(x1-1, x2+1, y2+1, cbright);
Hline(*grd_curcanv, x1 - 1, x2 + 1, y2 + 1, cbright);
Vline( y1, y2+1, x2+1, cbright);
}

5
common/ui/message.cpp
View file

@ -77,9 +77,8 @@ static window_event_result messagebox_handler(UI_DIALOG *dlg,const d_event &even
ui_dialog_set_current_canvas(dlg);
ui_string_centered( m->width/2, m->text_y, m->text );
Hline(1, m->width-2, m->line_y+1, CGREY);
Hline(2, m->width-2, m->line_y+2, CBRIGHT);
Hline(*grd_curcanv, 1, m->width - 2, m->line_y + 1, CGREY);
Hline(*grd_curcanv, 2, m->width - 2, m->line_y + 2, CBRIGHT);
grd_curscreen->sc_canvas.cv_font = temp_font;

8
common/ui/uidraw.cpp
View file

@ -25,9 +25,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
namespace dcx {
void Hline(short x1, short x2, short y, const uint8_t color)
void Hline(grs_canvas &canvas, const fix x1, const fix x2, const fix y, const uint8_t color)
{
gr_uline(*grd_curcanv, i2f(x1), i2f(y), i2f(x2), i2f(y), color);
gr_uline(canvas, i2f(x1), i2f(y), i2f(x2), i2f(y), color);
}
void Vline(short y1, short y2, short x, const uint8_t color)
@ -49,10 +49,10 @@ void ui_string_centered( short x, short y, const char * s )
void ui_draw_shad( short x1, short y1, short x2, short y2, short c1, short c2 )
{
Hline(x1+0, x2-1, y1+0, c1);
Hline(*grd_curcanv, x1 + 0, x2 - 1, y1 + 0, c1);
Vline(y1+1, y2+0, x1+0, c1);
Hline(x1+1, x2, y2-0, c2);
Hline(*grd_curcanv, x1 + 1, x2, y2 - 0, c2);
Vline(y1+0, y2-1, x2-0, c2);
}