mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2014-07-13 13:50:54 +04:00
parent b676158117 7fd819dc0f
commit 8e3ba09047
49 changed files with 3724 additions and 2103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/gui/style_core.cpp
View File

@@ -32,7 +32,7 @@ namespace style {
modified[_flags] = Font(this);
f.setPixelSize(size);
f.setBold(_flags & FontBold);
f.setBold(_flags & FontBold);
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);
f.setStyleStrategy(QFont::PreferQuality);

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

@@ -1245,9 +1245,9 @@ public:
break;
}
}/**/
for (; _lineEnd > _lineStart + 1; --_lineEnd) {
for (; _lineEnd > _lineStart; --_lineEnd) {
QChar ch = _t->_text.at(_lineEnd - 1);
if (ch != QChar::Space && ch != QChar::LineFeed) {
if ((ch != QChar::Space || _lineEnd == _lineStart + 1) && ch != QChar::LineFeed) {
break;
}
}/**/