From 40f1682b730719d1b1b49e56268fddcd6b548a52 Mon Sep 17 00:00:00 2001 From: twanvl Date: Wed, 25 Jun 2008 12:42:44 +0000 Subject: [PATCH] Don't try to draw text on symbols if there is no font git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1003 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/data/symbol_font.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp index dfc43011..b52a0fd1 100644 --- a/src/data/symbol_font.cpp +++ b/src/data/symbol_font.cpp @@ -285,7 +285,7 @@ void SymbolFont::drawSymbol(RotatedDC& dc, RealRect sym_rect, double font_size, dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), sym_rect)); // 2. draw text - if (text.empty()) return; + if (text.empty() || !sym.text_font) return; // subtract margins from size sym_rect.x += font_size * sym.text_margin_left; sym_rect.y += font_size * sym.text_margin_top; @@ -319,7 +319,7 @@ void SymbolFont::drawSymbol(RotatedDC& dc, RealRect sym_rect, double font_size, Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) { if (!sym.symbol) return Image(1,1); - if (sym.draw_text.empty()) return sym.symbol->getImage(*this, font_size); + if (sym.draw_text.empty() || !sym.symbol->text_font) return sym.symbol->getImage(*this, font_size); // with text Bitmap bmp(sym.symbol->getImage(*this, font_size)); // memory dc to work with