mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #662 from bolt-blue/indentation_quickfix 

Improve one poor case of indentation
This commit is contained in:
Rob Loach 2024-07-20 03:06:17 -04:00 committed by GitHub
parent 0319c0ff3b a689b8efdf
commit 8f3fc31ba5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nuklear.h
View File

@ -9694,14 +9694,16 @@ nk_draw_list_push_image(struct nk_draw_list *list, nk_handle texture)
struct nk_draw_command *prev = nk_draw_list_command_last(list); struct nk_draw_command *prev = nk_draw_list_command_last(list);
if (prev->elem_count == 0) { if (prev->elem_count == 0) {
prev->texture = texture; prev->texture = texture;
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA
prev->userdata = list->userdata; prev->userdata = list->userdata;
#endif #endif
} else if (prev->texture.id != texture.id } else if (prev->texture.id != texture.id
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA
|| prev->userdata.id != list->userdata.id || prev->userdata.id != list->userdata.id
#endif #endif
) nk_draw_list_push_command(list, prev->clip_rect, texture); ) {
nk_draw_list_push_command(list, prev->clip_rect, texture);
}
} }
} }
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA

16
src/nuklear_vertex.c
View File

@ -196,14 +196,16 @@ nk_draw_list_push_image(struct nk_draw_list *list, nk_handle texture)
struct nk_draw_command *prev = nk_draw_list_command_last(list); struct nk_draw_command *prev = nk_draw_list_command_last(list);
if (prev->elem_count == 0) { if (prev->elem_count == 0) {
prev->texture = texture; prev->texture = texture;
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA
prev->userdata = list->userdata; prev->userdata = list->userdata;
#endif #endif
} else if (prev->texture.id != texture.id } else if (prev->texture.id != texture.id
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA
|| prev->userdata.id != list->userdata.id || prev->userdata.id != list->userdata.id
#endif #endif
) nk_draw_list_push_command(list, prev->clip_rect, texture); ) {
nk_draw_list_push_command(list, prev->clip_rect, texture);
}
} }
} }
#ifdef NK_INCLUDE_COMMAND_USERDATA #ifdef NK_INCLUDE_COMMAND_USERDATA