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

Fixed vertical alignment of "<line>.." (i.e. cards with empty rule text)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@314 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-04-30 22:47:35 +00:00
parent cc642c58b0
commit 944d0d03b3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/text/viewer.cpp
+6 -2
View File
@@ -369,7 +369,7 @@ void TextViewer::prepareLines(RotatedDC& dc, const String& text, const TextStyle
lines[0].line_height = style.symbol_font.font->defaultSymbolSize(ctx, style.symbol_font.size).height;
} else {
dc.SetFont(style.font, scale);
lines[0].line_height = dc.GetTextExtent(_(" ")).height;
lines[0].line_height = dc.GetCharHeight();
}
}
@@ -425,7 +425,11 @@ bool TextViewer::prepareLinesScale(RotatedDC& dc, const vector<CharInfo>& chars,
line_height_multiplier = style.line_height_soft;
}
// Add size of the character
word_size = add_horizontal(word_size, c.size);
if (c.break_after != BREAK_LINE) {
// ^^ HACK: don't count the line height of <line> tags, if they are the only thing on a line
// then the linebreak is 'ignored'.
word_size = add_horizontal(word_size, c.size);
}
positions_word.push_back(word_size.width);
// Did the word become too long?
if (style.field().multi_line && !break_now) {