edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some bugs

Browse source
This commit is contained in:
Magnus Auvinen 2007-07-20 22:30:11 +00:00
parent 52c8d980a2
commit c6eb611d8f
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/game/client/menu.cpp
View file

@ -243,10 +243,13 @@ struct server_list
int ui_do_key_reader(void *id, float x, float y, float w, float h, int key) int ui_do_key_reader(void *id, float x, float y, float w, float h, int key)
{ {
// process // process
static bool can_be_selected = true; static bool mouse_released = true;
int inside = ui_mouse_inside(x, y, w, h); int inside = ui_mouse_inside(x, y, w, h);
int new_key = key; int new_key = key;
if(!ui_mouse_button(0))
mouse_released = true;
if(ui_active_item() == id) if(ui_active_item() == id)
{ {
int k = input::last_key(); int k = input::last_key();
@ -254,19 +257,18 @@ int ui_do_key_reader(void *id, float x, float y, float w, float h, int key)
{ {
new_key = k; new_key = k;
ui_set_active_item(0); ui_set_active_item(0);
can_be_selected = false; mouse_released = false;
} }
} }
else if(ui_hot_item() == id) else if(ui_hot_item() == id)
{ {
if(ui_mouse_button(0)) if(ui_mouse_button(0) && mouse_released)
ui_set_active_item(id); ui_set_active_item(id);
} }
if(inside) if(inside)
ui_set_hot_item(id); ui_set_hot_item(id);
// draw // draw
draw_box(GUI_BOX_SCREEN_INFO, tileset_regular, x, y, w, h); draw_box(GUI_BOX_SCREEN_INFO, tileset_regular, x, y, w, h);
@ -329,7 +331,7 @@ int ui_do_edit_box(void *id, float x, float y, float w, float h, char *str, int
int inside = ui_mouse_inside(x, y, w, h); int inside = ui_mouse_inside(x, y, w, h);
int r = 0; int r = 0;
if (ui_active_item() == id) if(ui_last_active_item() == id)
{ {
int c = input::last_char(); int c = input::last_char();
int k = input::last_key(); int k = input::last_key();
@ -351,6 +353,12 @@ int ui_do_edit_box(void *id, float x, float y, float w, float h, char *str, int
} }
r = 1; r = 1;
} }
if(ui_active_item() == id)
{
if(!ui_mouse_button(0))
ui_set_active_item(0);
}
else if(ui_hot_item() == id) else if(ui_hot_item() == id)
{ {
if(ui_mouse_button(0)) if(ui_mouse_button(0))
@ -364,7 +372,7 @@ int ui_do_edit_box(void *id, float x, float y, float w, float h, char *str, int
ui_do_label(x + 10, y, str, 36); ui_do_label(x + 10, y, str, 36);
if (ui_active_item() == id) if (ui_last_active_item() == id)
{ {
float w = gfx_pretty_text_width(36.0f, str); float w = gfx_pretty_text_width(36.0f, str);
ui_do_label(x + 10 + w, y, "_", 36); ui_do_label(x + 10 + w, y, "_", 36);