RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
John Preston 2015-01-23 13:22:28 +03:00
parent a7b4d81a11 8dca319545
commit bbcca80503
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,8 @@ _text(st.width ? st.width : QFIXED_MAX), _st(st), _tst(tst), _opacity(1) {
void FlatLabel::setText(const QString &text) {
textstyleSet(&_tst);
_text.setText(_st.font, text, _labelOptions);
textstyleRestore();
int32 w = _st.width ? _st.width : _text.maxWidth(), h = _text.countHeight(w);
textstyleRestore();
resize(w, h);
}
@ -45,8 +45,8 @@ void FlatLabel::setRichText(const QString &text) {
textstyleSet(&_tst);
const char *t = text.toUtf8().constData();
_text.setRichText(_st.font, text, _labelOptions);
textstyleRestore();
int32 w = _st.width ? _st.width : _text.maxWidth(), h = _text.countHeight(w);
textstyleRestore();
resize(w, h);
setMouseTracking(_text.hasLinks());
}