amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 21:47:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to draw text on symbols if there is no font

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1003 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-25 12:42:44 +00:00
parent 37329ec63e
commit 40f1682b73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/symbol_font.cpp
+2 -2
View File
@@ -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)); dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), sym_rect));
// 2. draw text // 2. draw text
if (text.empty()) return; if (text.empty() || !sym.text_font) return;
// subtract margins from size // subtract margins from size
sym_rect.x += font_size * sym.text_margin_left; sym_rect.x += font_size * sym.text_margin_left;
sym_rect.y += font_size * sym.text_margin_top; 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) { Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) {
if (!sym.symbol) return Image(1,1); 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 // with text
Bitmap bmp(sym.symbol->getImage(*this, font_size)); Bitmap bmp(sym.symbol->getImage(*this, font_size));
// memory dc to work with // memory dc to work with