Эх сурвалжийг харах

Fixed C90 compliance issue

Jacob Ahnstedt 1 жил өмнө
parent
commit
df13a41ada
2 өөрчлөгдсөн 6 нэмэгдсэн , 6 устгасан
  1. 3 3
      nuklear.h
  2. 3 3
      src/nuklear_edit.c

+ 3 - 3
nuklear.h

@@ -27190,14 +27190,14 @@ nk_edit_draw_text(struct nk_command_buffer *out,
     float line_offset = 0;
     int line_count = 0;
 
-    foreground = nk_rgb_factor(foreground, style->color_factor);
-    background = nk_rgb_factor(background, style->color_factor);
-
     struct nk_text txt;
     txt.padding = nk_vec2(0,0);
     txt.background = background;
     txt.text = foreground;
 
+    foreground = nk_rgb_factor(foreground, style->color_factor);
+    background = nk_rgb_factor(background, style->color_factor);
+
     glyph_len = nk_utf_decode(text+text_len, &unicode, byte_len-text_len);
     if (!glyph_len) return;
     while ((text_len < byte_len) && glyph_len)

+ 3 - 3
src/nuklear_edit.c

@@ -89,14 +89,14 @@ nk_edit_draw_text(struct nk_command_buffer *out,
     float line_offset = 0;
     int line_count = 0;
 
-    foreground = nk_rgb_factor(foreground, style->color_factor);
-    background = nk_rgb_factor(background, style->color_factor);
-
     struct nk_text txt;
     txt.padding = nk_vec2(0,0);
     txt.background = background;
     txt.text = foreground;
 
+    foreground = nk_rgb_factor(foreground, style->color_factor);
+    background = nk_rgb_factor(background, style->color_factor);
+
     glyph_len = nk_utf_decode(text+text_len, &unicode, byte_len-text_len);
     if (!glyph_len) return;
     while ((text_len < byte_len) && glyph_len)