From 43b35bea003a3485b2c1d0778837614492271ab0 Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Sun, 27 Oct 2013 20:02:41 +0000 Subject: [PATCH] * Source/GSHorizontalTypesetter.m (-layoutLineNewParagraph:): Only adjust max_line_height to minimumLineHeight if it isn't zero. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37296 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/GSHorizontalTypesetter.m | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46c9760da..c00a74172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-27 Fred Kiefer + + * Source/GSHorizontalTypesetter.m (-layoutLineNewParagraph:): Only + adjust max_line_height to minimumLineHeight if it isn't zero. + 2013-10-26 Fred Kiefer * Source/NSTextView.m (-mouseDown:): Use container origin for diff --git a/Source/GSHorizontalTypesetter.m b/Source/GSHorizontalTypesetter.m index e3ea4ea62..f21c8422c 100644 --- a/Source/GSHorizontalTypesetter.m +++ b/Source/GSHorizontalTypesetter.m @@ -607,7 +607,7 @@ Return values 0, 1, 2 are mostly the same as from max_line_height = [curParagraphStyle maximumLineHeight]; /* sanity */ - if (max_line_height < min) + if (max_line_height > 0 && max_line_height < min) max_line_height = min; line_height = [cache->font defaultLineHeightForFont];