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

Fixed: direction:vertical was putting characters on the next line, causing multi-char symbols to render incorrectly

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@805 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-12-30 13:42:29 +00:00
parent f04aa61aa6
commit 17965eea73
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/text/viewer.cpp
+6 -4
View File
@@ -520,9 +520,10 @@ bool TextViewer::prepareLinesScale(RotatedDC& dc, const vector<CharInfo>& chars,
for(size_t i = 0 ; i < chars.size() ; ++i) { for(size_t i = 0 ; i < chars.size() ; ++i) {
const CharInfo& c = chars[i]; const CharInfo& c = chars[i];
// Should we break? // Should we break?
bool break_now = false; bool word_too_long = false;
bool accept_word = false; // the current word should be added to the line bool break_now = false;
bool hide_breaker = true; // hide the \n or _(' ') that caused a line break bool accept_word = false; // the current word should be added to the line
bool hide_breaker = true; // hide the \n or _(' ') that caused a line break
if (c.break_after == BREAK_SOFT || c.break_after == BREAK_HARD || c.break_after == BREAK_LINE) { if (c.break_after == BREAK_SOFT || c.break_after == BREAK_HARD || c.break_after == BREAK_LINE) {
break_now = true; break_now = true;
accept_word = true; accept_word = true;
@@ -557,6 +558,7 @@ bool TextViewer::prepareLinesScale(RotatedDC& dc, const vector<CharInfo>& chars,
break_now = true; break_now = true;
accept_word = true; accept_word = true;
hide_breaker = false; hide_breaker = false;
word_too_long = true;
line.break_after = BREAK_SOFT; line.break_after = BREAK_SOFT;
} }
} else { } else {
@@ -580,7 +582,7 @@ bool TextViewer::prepareLinesScale(RotatedDC& dc, const vector<CharInfo>& chars,
positions_word.clear(); positions_word.clear();
word_end_or_soft = 0; word_end_or_soft = 0;
// move character that goes outside the box to the next line // move character that goes outside the box to the next line
if (!hide_breaker && line.positions.size() > 2) { if (word_too_long && line.positions.size() > 2) {
line.positions.pop_back(); line.positions.pop_back();
word_start = i; word_start = i;
word_size = add_horizontal(word_size, c.size); word_size = add_horizontal(word_size, c.size);