Merge branch 'master' into xib_document

This commit is contained in:
fredkiefer 2019-12-09 11:16:39 +01:00
commit 9032de5842
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2019-12-09 Sergii Stoian <stoyan255@gmail.com>
* Source/NSStringDrawing.m: fixed incorrect string drawing (shortened, misplaced)
in ART backend. It seems that third parameter to `cache_lookup` function
(BOOL useScreenFonts) is valuable for ART but not for Cairo backend.
2019-12-07 Fred Kiefer <FredKiefer@gmx.de>
* .travis.yml

View file

@ -510,7 +510,7 @@ static void draw_in_rect(cache_t *c, NSRect rect)
NS_DURING
{
prepare_attributed_string(self);
c = cache_lookup(hasSize, size, NO);
c = cache_lookup(hasSize, size, YES);
result = c->usedRect;
}
NS_HANDLER
@ -603,7 +603,7 @@ static void draw_in_rect(cache_t *c, NSRect rect)
NS_DURING
{
prepare_string(self, attrs);
c = cache_lookup(hasSize, size, NO);
c = cache_lookup(hasSize, size, YES);
result = c->usedRect;
}
NS_HANDLER