From a689b8efdf78e9e4a3d984dc8a84663fce6a11ec Mon Sep 17 00:00:00 2001 From: bolt Date: Thu, 18 Jul 2024 08:58:43 +0100 Subject: [PATCH] Improve one poor case of indentation The original code was distinctly unclear. I've tried to keep to the surrounding code style while making the code flow more comprehensible. I've not looked elsewhere for any other similar occurrences; this became apparent while investigating a specific line of thought. --- nuklear.h | 16 +++++++++------- src/nuklear_vertex.c | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/nuklear.h b/nuklear.h index 736cf9b..8f2b3ef 100644 --- a/nuklear.h +++ b/nuklear.h @@ -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); if (prev->elem_count == 0) { prev->texture = texture; - #ifdef NK_INCLUDE_COMMAND_USERDATA + #ifdef NK_INCLUDE_COMMAND_USERDATA prev->userdata = list->userdata; - #endif - } else if (prev->texture.id != texture.id - #ifdef NK_INCLUDE_COMMAND_USERDATA - || prev->userdata.id != list->userdata.id - #endif - ) nk_draw_list_push_command(list, prev->clip_rect, texture); + #endif + } else if (prev->texture.id != texture.id + #ifdef NK_INCLUDE_COMMAND_USERDATA + || prev->userdata.id != list->userdata.id + #endif + ) { + nk_draw_list_push_command(list, prev->clip_rect, texture); + } } } #ifdef NK_INCLUDE_COMMAND_USERDATA diff --git a/src/nuklear_vertex.c b/src/nuklear_vertex.c index ce1f94e..10cff04 100644 --- a/src/nuklear_vertex.c +++ b/src/nuklear_vertex.c @@ -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); if (prev->elem_count == 0) { prev->texture = texture; - #ifdef NK_INCLUDE_COMMAND_USERDATA + #ifdef NK_INCLUDE_COMMAND_USERDATA prev->userdata = list->userdata; - #endif - } else if (prev->texture.id != texture.id - #ifdef NK_INCLUDE_COMMAND_USERDATA - || prev->userdata.id != list->userdata.id - #endif - ) nk_draw_list_push_command(list, prev->clip_rect, texture); + #endif + } else if (prev->texture.id != texture.id + #ifdef NK_INCLUDE_COMMAND_USERDATA + || prev->userdata.id != list->userdata.id + #endif + ) { + nk_draw_list_push_command(list, prev->clip_rect, texture); + } } } #ifdef NK_INCLUDE_COMMAND_USERDATA