mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-11-20 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lock/unlock surface one time on ui::draw_text()

Browse Source
This commit is contained in:
David Capello 2017-04-19 19:32:18 -03:00
parent cc7bde6cd1
commit 8b0c269b56
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/she/draw_text.cpp
View File

@ -58,6 +58,13 @@ retry:;
case FontType::kSpriteSheet: {
SpriteSheetFont* ssFont = static_cast<SpriteSheetFont*>(font);
Surface* sheet = ssFont->getSurfaceSheet();
if (surface) {
sheet->lock();
surface->lock();
}
while (it != end) {
int chr = *it;
if (delegate) {
@ -71,11 +78,8 @@ retry:;
break;
if (!charBounds.isEmpty()) {
if (surface) {
Surface* sheet = ssFont->getSurfaceSheet();
SurfaceLock lock(sheet);
if (surface)
surface->drawColoredRgbaSurface(sheet, fg, bg, gfx::Clip(x, y, charBounds));
}
}
textBounds |= outCharBounds;
@ -85,6 +89,11 @@ retry:;
x += charBounds.w;
++it;
}
if (surface) {
surface->unlock();
sheet->unlock();
}
break;
}
@ -98,6 +107,7 @@ retry:;
if (surface) {
clipBounds = surface->getClipBounds();
surface->getFormat(&fd);
surface->lock();
}
ft::ForEachGlyph<FreeTypeFont::Face> feg(ttFont->face());
@ -204,6 +214,9 @@ retry:;
delegate->postDrawChar(origDstBounds);
} while (feg.nextChar());
}
if (surface)
surface->unlock();
break;
}