Skip to content

M
magicseteditor
Commit af318249 authored by twanvl's avatar twanvl
Browse files
Options

Fixed exporting of symbol font images without text

parent e5b19b63
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/data/symbol_font.cpp
View file @ af318249
...@@ -318,8 +318,9 @@ void SymbolFont::drawSymbol(RotatedDC& dc, RealRect sym_rect, double font_size, ...@@ -318,8 +318,9 @@ 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 || !sym.symbol->text_font) if (!sym.symbol) return Image(1,1);
return Image(1,1); if (sym.draw_text.empty()) return sym.symbol->getImage(*this, font_size);
// 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
wxMemoryDC dc; wxMemoryDC dc;
...@@ -338,7 +339,7 @@ Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) { ...@@ -338,7 +339,7 @@ Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) {
while (true) { while (true) {
if (size <= 0) return sym.symbol->getImage(*this, font_size); // text too small if (size <= 0) return sym.symbol->getImage(*this, font_size); // text too small
rdc.SetFont(*sym.symbol->text_font, size / sym.symbol->text_font->size); rdc.SetFont(*sym.symbol->text_font, size / sym.symbol->text_font->size);
ts = rdc.GetTextExtent(sym.text); ts = rdc.GetTextExtent(sym.draw_text);
if (ts.height <= sym_rect.height) { if (ts.height <= sym_rect.height) {
if (ts.width <= sym_rect.width) { if (ts.width <= sym_rect.width) {
break; // text fits break; // text fits
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment