MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed debug build flags and emoji insert on retina

This commit is contained in:
John Preston 2014-06-16 00:39:30 +04:00
parent 11907318b2
commit 7d9d5aa81a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,8 +270,8 @@ void FlatTextarea::insertEmoji(EmojiPtr emoji, QTextCursor c) {
QString url = qsl("emoji://") + QString::number(emoji->code, 16);
document()->addResource(QTextDocument::ImageResource, QUrl(url), QVariant(img));
QTextImageFormat imageFormat;
imageFormat.setWidth(img.width());
imageFormat.setHeight(img.height());
imageFormat.setWidth(img.width() / cIntRetinaFactor());
imageFormat.setHeight(img.height() / cIntRetinaFactor());
imageFormat.setName(url);
imageFormat.setVerticalAlignment(QTextCharFormat::AlignBaseline);
c.insertImage(imageFormat);

6
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -1497,8 +1497,6 @@
"-Wall",
"-W",
"-fPIE",
"-D_DEBUG",
"-D_DEBUG",
"-DQT_MULTIMEDIA_LIB",
"-DQT_WIDGETS_LIB",
"-DQT_NETWORK_LIB",
@ -1513,8 +1511,6 @@
"-Wall",
"-W",
"-fPIE",
"-D_DEBUG",
"-D_DEBUG",
"-DQT_MULTIMEDIA_LIB",
"-DQT_WIDGETS_LIB",
"-DQT_NETWORK_LIB",
@ -1602,7 +1598,6 @@
"-W",
"-fPIE",
"-D_DEBUG",
"-D_DEBUG",
"-DQT_MULTIMEDIA_LIB",
"-DQT_WIDGETS_LIB",
"-DQT_NETWORK_LIB",
@ -1618,7 +1613,6 @@
"-W",
"-fPIE",
"-D_DEBUG",
"-D_DEBUG",
"-DQT_MULTIMEDIA_LIB",
"-DQT_WIDGETS_LIB",
"-DQT_NETWORK_LIB",