mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

conflicts fixed

Browse Source
This commit is contained in:
John Preston
2014-06-14 23:42:21 +04:00
parent cace79bc18 8a2ac6573f
commit 9f36622c08
16 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Telegram/SourceFiles/gui/text.cpp
View File

@@ -1063,8 +1063,11 @@ public:
continue;
}
bool elidedLine = _elideLast && (_y + _lineHeight >= _yTo);
if (f != j && !elidedLine) {
int32 elidedLineHeight = qMax(_lineHeight, blockHeight);
bool elidedLine = _elideLast && (_y + elidedLineHeight >= _yTo);
if (elidedLine) {
_lineHeight = elidedLineHeight;
} else if (f != j) {
j = f;
_wLeft = f_wLeft;
_lineHeight = f_lineHeight;
@@ -1088,7 +1091,11 @@ public:
continue;
}
bool elidedLine = _elideLast && (_y + _lineHeight >= _yTo);
int32 elidedLineHeight = qMax(_lineHeight, blockHeight);
bool elidedLine = _elideLast && (_y + elidedLineHeight >= _yTo);
if (elidedLine) {
_lineHeight = elidedLineHeight;
}
if (!drawLine(elidedLine ? _blockEnd(_t, i, e) : b->from(), i, e)) return;
_y += _lineHeight;
_lineHeight = qMax(0, blockHeight);
@@ -1536,7 +1543,7 @@ public:
void elideSaveBlock(int32 blockIndex, ITextBlock *&_endBlock, int32 elideStart, int32 elideWidth) {
_elideSavedIndex = blockIndex;
_elideSavedBlock = _t->_blocks[blockIndex];
const_cast<Text*>(_t)->_blocks[blockIndex] = new SkipBlock(_t->_font, _t->_text, elideStart, elideWidth, _f->height, _elideSavedBlock->lnkIndex());
const_cast<Text*>(_t)->_blocks[blockIndex] = new TextBlock(_t->_font, _t->_text, QFIXED_MAX, elideStart, 0, _elideSavedBlock->flags(), _elideSavedBlock->color(), _elideSavedBlock->lnkIndex());
_blocksSize = blockIndex + 1;
_endBlock = (blockIndex + 1 < _t->_blocks.size() ? _t->_blocks[blockIndex + 1] : 0);
}
@@ -1648,9 +1655,11 @@ public:
lineLength += _Elide.size();
if (!repeat) {
for (; _t->_blocks[blockIndex] != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
for (; blockIndex < _blocksSize && _t->_blocks[blockIndex] != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
}
if (blockIndex < _blocksSize) {
elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
}
elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
}
}