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

Merge branch 'dev' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev

This commit is contained in:
John Preston 2016-03-24 15:57:29 +03:00
parent 7c99f947eb 82e4660ae9
commit 1f423a6da2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/history.h
View File

@ -2523,7 +2523,7 @@ protected:
} }
void paintForwardedInfo(Painter &p, int32 x, int32 y, int32 w, bool selected) const; void paintForwardedInfo(Painter &p, int32 x, int32 y, int32 w, bool selected) const;
Text _text = { st::msgMinWidth }; Text _text = { int(st::msgMinWidth) };
int _textWidth = 0; int _textWidth = 0;
int _textHeight = 0; int _textHeight = 0;