Merge branch 'BieHDC-fix_multiline_edit'
This commit is contained in:
commit
79ab55b1b6
@ -26855,7 +26855,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
|
||||
/* vertical scroll */
|
||||
if (cursor_pos.y < edit->scrollbar.y)
|
||||
edit->scrollbar.y = NK_MAX(0.0f, cursor_pos.y - row_height);
|
||||
if (cursor_pos.y >= edit->scrollbar.y + area.h)
|
||||
if (cursor_pos.y >= edit->scrollbar.y + row_height)
|
||||
edit->scrollbar.y = edit->scrollbar.y + row_height;
|
||||
} else edit->scrollbar.y = 0;
|
||||
}
|
||||
@ -29175,6 +29175,7 @@ nk_tooltipfv(struct nk_context *ctx, const char *fmt, va_list args)
|
||||
/// - [yy]: Minor version with non-breaking API and library changes
|
||||
/// - [zz]: Bug fix version with no direct changes to API
|
||||
///
|
||||
/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset
|
||||
/// - 2021/03/17 (4.07.1) - Fix warning about unused parameter
|
||||
/// - 2021/03/17 (4.07.0) - Fix nk_property hover bug
|
||||
/// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "nuklear",
|
||||
"version": "4.07.1",
|
||||
"version": "4.07.2",
|
||||
"repo": "Immediate-Mode-UI/Nuklear",
|
||||
"description": "A small ANSI C gui toolkit",
|
||||
"keywords": ["gl", "ui", "toolkit"],
|
||||
|
@ -8,6 +8,7 @@
|
||||
/// - [yy]: Minor version with non-breaking API and library changes
|
||||
/// - [zz]: Bug fix version with no direct changes to API
|
||||
///
|
||||
/// - 2021/08/08 (4.07.2) - Fix Multiline Edit wrong offset
|
||||
/// - 2021/03/17 (4.07.1) - Fix warning about unused parameter
|
||||
/// - 2021/03/17 (4.07.0) - Fix nk_property hover bug
|
||||
/// - 2021/03/15 (4.06.4) - Change nk_propertyi back to int
|
||||
|
@ -471,7 +471,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
|
||||
/* vertical scroll */
|
||||
if (cursor_pos.y < edit->scrollbar.y)
|
||||
edit->scrollbar.y = NK_MAX(0.0f, cursor_pos.y - row_height);
|
||||
if (cursor_pos.y >= edit->scrollbar.y + area.h)
|
||||
if (cursor_pos.y >= edit->scrollbar.y + row_height)
|
||||
edit->scrollbar.y = edit->scrollbar.y + row_height;
|
||||
} else edit->scrollbar.y = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user