From c61d4f063c64958bd98a12e485aea1f244fc93d9 Mon Sep 17 00:00:00 2001
From: vurtun <polygone@gmx.net>
Date: Mon, 14 Nov 2016 19:21:49 +0100
Subject: [PATCH] Fixed edit multiline widget width calculation

---
 demo/calculator.c | 6 ++----
 demo/overview.c   | 2 +-
 nuklear.h         | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/demo/calculator.c b/demo/calculator.c
index c45cc6a..b871301 100644
--- a/demo/calculator.c
+++ b/demo/calculator.c
@@ -2,8 +2,7 @@
 static void
 calculator(struct nk_context *ctx)
 {
-    struct nk_panel layout;
-    if (nk_begin(ctx, &layout, "Calculator", nk_rect(10, 10, 180, 250),
+    if (nk_begin(ctx, "Calculator", nk_rect(10, 10, 180, 250),
         NK_WINDOW_BORDER|NK_WINDOW_NO_SCROLLBAR|NK_WINDOW_MOVABLE))
     {
         static int set = 0, prev = 0, op = 0;
@@ -29,8 +28,7 @@ calculator(struct nk_context *ctx)
                     a = b = op = 0; current = &a; set = 0;
                 } if (nk_button_label(ctx, "0")) {
                     *current = *current*10.0f; set = 0;
-                }
-                if (nk_button_label(ctx, "=")) {
+                } if (nk_button_label(ctx, "=")) {
                     solve = 1; prev = op; op = 0;
                 }
             } else if (((i+1) % 4)) {
diff --git a/demo/overview.c b/demo/overview.c
index 7772378..e271318 100644
--- a/demo/overview.c
+++ b/demo/overview.c
@@ -36,7 +36,7 @@ overview(struct nk_context *ctx)
             static int mcheck = nk_true;
 
             nk_menubar_begin(ctx);
-            nk_layout_row_begin(ctx, NK_STATIC, 25, 2);
+            nk_layout_row_begin(ctx, NK_STATIC, 25, 4);
             nk_layout_row_push(ctx, 45);
             if (nk_menu_begin_label(ctx, "MENU", NK_TEXT_LEFT, nk_vec2(120, 200)))
             {
diff --git a/nuklear.h b/nuklear.h
index b79765a..6c74198 100644
--- a/nuklear.h
+++ b/nuklear.h
@@ -14128,7 +14128,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
     area.w = bounds.w - (2.0f * style->padding.x + 2 * style->border);
     area.h = bounds.h - (2.0f * style->padding.y + 2 * style->border);
     if (flags & NK_EDIT_MULTILINE)
-        area.w = NK_MAX(0, area.w - style->scrollbar_size.y);
+        area.w = NK_MAX(0, area.w - style->scrollbar_size.x);
     row_height = (flags & NK_EDIT_MULTILINE)? font->height + style->row_padding: area.h;
 
     /* calculate clipping rectangle */
@@ -14283,7 +14283,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
         nk_fill_rect(out, bounds, style->rounding, background->data.color);
     } else nk_draw_image(out, bounds, &background->data.image, nk_white);}
 
-    area.w -= style->cursor_size + style->scrollbar_size.x;
+    area.w = NK_MAX(0, area.w - style->cursor_size);
     if (edit->active)
     {
         int total_lines = 1;