From d5d307d503dc4c3b5f5ad645559ca5e1d9c98609 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 25 Sep 2018 14:15:55 +0200
Subject: gl: Fix dialog size calculation in text field dialog.

---
 platform/gl/gl-font.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'platform/gl/gl-font.c')

diff --git a/platform/gl/gl-font.c b/platform/gl/gl-font.c
index 33dbcdf5..0e33a6a3 100644
--- a/platform/gl/gl-font.c
+++ b/platform/gl/gl-font.c
@@ -346,8 +346,8 @@ int ui_break_lines(char *a, struct line *lines, int maxlines, int width, int *ma
 			{
 				lines[n].a = a;
 				lines[n].b = b;
-				++n;
 			}
+			++n;
 			if (maxwidth && *maxwidth < x)
 				*maxwidth = x;
 			a = next;
@@ -371,8 +371,8 @@ int ui_break_lines(char *a, struct line *lines, int maxlines, int width, int *ma
 					{
 						lines[n].a = a;
 						lines[n].b = space;
-						++n;
 					}
+					++n;
 					if (maxwidth && *maxwidth < space_x)
 						*maxwidth = space_x;
 					a = next = space + 1;
@@ -385,8 +385,8 @@ int ui_break_lines(char *a, struct line *lines, int maxlines, int width, int *ma
 					{
 						lines[n].a = a;
 						lines[n].b = b;
-						++n;
 					}
+					++n;
 					if (maxwidth && *maxwidth < x)
 						*maxwidth = x;
 					a = b;
@@ -406,11 +406,11 @@ int ui_break_lines(char *a, struct line *lines, int maxlines, int width, int *ma
 	{
 		lines[n].a = a;
 		lines[n].b = b;
-		++n;
 	}
+	++n;
 	if (maxwidth && *maxwidth < x)
 		*maxwidth = x;
-	return n;
+	return n < maxlines ? n : maxlines;
 }
 
 void ui_draw_lines(float x, float y, struct line *lines, int n)
-- 
cgit v1.2.3