v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix btn press regression

main
Dominik Madarász 2023-11-28 21:04:46 +01:00
parent a8cbc91bf6
commit 1e65c7cdcf
5 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
demos/99-sprite2.c → demos/99-sprite3d.c
View File

BIN
demos/art/gui/golden.ase
View File

Binary file not shown.

11
engine/joint/v4k.h
View File

@ -359032,13 +359032,15 @@ bool gui_button_id(int id, vec4 r, const char *skin) {
skin=skin?skin:"button"; skin=skin?skin:"button";
char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":""); char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":"");
if (gui_ismouseinrect(btn, r) && !any_widget_used) { if (gui_ismouseinrect(btn, r)) {
if (input_up(MOUSE_L) && entry->held) { if (input_up(MOUSE_L) && entry->held) {
was_clicked=1; was_clicked=1;
} }
any_widget_used = entry->held = input_held(MOUSE_L); if (!any_widget_used) {
entry->hover = true; any_widget_used = entry->held = input_held(MOUSE_L);
entry->hover = true;
}
} }
else if (input_up(MOUSE_L) && entry->held) { else if (input_up(MOUSE_L) && entry->held) {
entry->held = false; entry->held = false;
@ -359129,11 +359131,12 @@ bool gui_slider_label_id(int id, const char *text, vec4 rect, const char *skin,
bool state = gui_slider_id(id, rect, skin, min, max, step, value); bool state = gui_slider_id(id, rect, skin, min, max, step, value);
vec2 slidersize={0}; vec2 slidersize={0};
skin=skin?skin:"slider"; skin=skin?skin:"slider";
if (last_skin->getskinsize) last_skin->getskinsize(last_skin->userdata, skin, &slidersize);
vec2 textsize = font_rect(text); vec2 textsize = font_rect(text);
vec2 pos; vec2 pos;
pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/; pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/;
pos.y = rect.y - max(slidersize.y*.5f, rect.w*.5f) + textsize.y*.5f; pos.y = rect.y + max(slidersize.y*.5f, rect.w*.5f) - textsize.y*.5f;
font_goto(pos.x, pos.y); font_goto(pos.x, pos.y);
font_print(text); font_print(text);
return state; return state;

11
engine/split/v4k_gui.c
View File

@ -164,13 +164,15 @@ bool gui_button_id(int id, vec4 r, const char *skin) {
skin=skin?skin:"button"; skin=skin?skin:"button";
char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":""); char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":"");
if (gui_ismouseinrect(btn, r) && !any_widget_used) { if (gui_ismouseinrect(btn, r)) {
if (input_up(MOUSE_L) && entry->held) { if (input_up(MOUSE_L) && entry->held) {
was_clicked=1; was_clicked=1;
} }
any_widget_used = entry->held = input_held(MOUSE_L); if (!any_widget_used) {
entry->hover = true; any_widget_used = entry->held = input_held(MOUSE_L);
entry->hover = true;
}
} }
else if (input_up(MOUSE_L) && entry->held) { else if (input_up(MOUSE_L) && entry->held) {
entry->held = false; entry->held = false;
@ -261,11 +263,12 @@ bool gui_slider_label_id(int id, const char *text, vec4 rect, const char *skin,
bool state = gui_slider_id(id, rect, skin, min, max, step, value); bool state = gui_slider_id(id, rect, skin, min, max, step, value);
vec2 slidersize={0}; vec2 slidersize={0};
skin=skin?skin:"slider"; skin=skin?skin:"slider";
if (last_skin->getskinsize) last_skin->getskinsize(last_skin->userdata, skin, &slidersize);
vec2 textsize = font_rect(text); vec2 textsize = font_rect(text);
vec2 pos; vec2 pos;
pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/; pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/;
pos.y = rect.y - max(slidersize.y*.5f, rect.w*.5f) + textsize.y*.5f; pos.y = rect.y + max(slidersize.y*.5f, rect.w*.5f) - textsize.y*.5f;
font_goto(pos.x, pos.y); font_goto(pos.x, pos.y);
font_print(text); font_print(text);
return state; return state;

11
engine/v4k.c
View File

@ -11174,13 +11174,15 @@ bool gui_button_id(int id, vec4 r, const char *skin) {
skin=skin?skin:"button"; skin=skin?skin:"button";
char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":""); char *btn = va("%s%s", skin, entry->held?"_press":entry->hover?"_hover":"");
if (gui_ismouseinrect(btn, r) && !any_widget_used) { if (gui_ismouseinrect(btn, r)) {
if (input_up(MOUSE_L) && entry->held) { if (input_up(MOUSE_L) && entry->held) {
was_clicked=1; was_clicked=1;
} }
any_widget_used = entry->held = input_held(MOUSE_L); if (!any_widget_used) {
entry->hover = true; any_widget_used = entry->held = input_held(MOUSE_L);
entry->hover = true;
}
} }
else if (input_up(MOUSE_L) && entry->held) { else if (input_up(MOUSE_L) && entry->held) {
entry->held = false; entry->held = false;
@ -11271,11 +11273,12 @@ bool gui_slider_label_id(int id, const char *text, vec4 rect, const char *skin,
bool state = gui_slider_id(id, rect, skin, min, max, step, value); bool state = gui_slider_id(id, rect, skin, min, max, step, value);
vec2 slidersize={0}; vec2 slidersize={0};
skin=skin?skin:"slider"; skin=skin?skin:"slider";
if (last_skin->getskinsize) last_skin->getskinsize(last_skin->userdata, skin, &slidersize);
vec2 textsize = font_rect(text); vec2 textsize = font_rect(text);
vec2 pos; vec2 pos;
pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/; pos.x = rect.x + max(slidersize.x, rect.z) + 8 /*padding*/;
pos.y = rect.y - max(slidersize.y*.5f, rect.w*.5f) + textsize.y*.5f; pos.y = rect.y + max(slidersize.y*.5f, rect.w*.5f) - textsize.y*.5f;
font_goto(pos.x, pos.y); font_goto(pos.x, pos.y);
font_print(text); font_print(text);
return state; return state;