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

Pass UI_DIALOG& to ui_draw_userbox

Browse source
This commit is contained in:
Kp 2020-10-12 03:28:26 +00:00
parent b45e696574
commit 9e9429fe58
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/include/ui.h
View file

@ -348,7 +348,6 @@ extern void ui_inputbox_set_text(UI_GADGET_INPUTBOX *inputbox, const char *text)
__attribute_warn_unused_result
std::unique_ptr<UI_GADGET_USERBOX> ui_add_gadget_userbox(UI_DIALOG * dlg, short x, short y, short w, short h);
extern void ui_draw_userbox( UI_DIALOG *dlg, UI_GADGET_USERBOX * userbox );
int MenuX( int x, int y, int NumButtons, const char *const text[] );

15
common/ui/userbox.cpp
View file

@ -31,23 +31,26 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
namespace dcx {
void ui_draw_userbox( UI_DIALOG *dlg, UI_GADGET_USERBOX * userbox )
namespace {
void ui_draw_userbox(UI_DIALOG &dlg, UI_GADGET_USERBOX &userbox)
{
#if 0 //ndef OGL
if ( userbox->status==1 )
#endif
{
userbox->status = 0;
userbox.status = 0;
gr_set_current_canvas( userbox->canvas );
gr_set_current_canvas(userbox.canvas);
const uint8_t color = (dlg->keyboard_focus_gadget == userbox)
const uint8_t color = (dlg.keyboard_focus_gadget == &userbox)
? CRED
: CBRIGHT;
gr_ubox(*grd_curcanv, -1, -1, userbox->width, userbox->height, color);
gr_ubox(*grd_curcanv, -1, -1, userbox.width, userbox.height, color);
}
}
}
std::unique_ptr<UI_GADGET_USERBOX> ui_add_gadget_userbox(UI_DIALOG * dlg, short x, short y, short w, short h)
{
@ -77,7 +80,7 @@ window_event_result UI_GADGET_USERBOX::event_handler(UI_DIALOG &dlg, const d_eve
window_event_result rval = window_event_result::ignored;
if (event.type == EVENT_WINDOW_DRAW)
ui_draw_userbox(&dlg, this);
ui_draw_userbox(dlg, *this);
const auto keypress = (event.type == EVENT_KEY_COMMAND)
? event_key_get(event)