From 7d9d5aa81a575bfe6449e63393470c5facbf1895 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 16 Jun 2014 00:39:30 +0400 Subject: [PATCH] fixed debug build flags and emoji insert on retina --- Telegram/SourceFiles/gui/flattextarea.cpp | 4 ++-- Telegram/Telegram.xcodeproj/project.pbxproj | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Telegram/SourceFiles/gui/flattextarea.cpp b/Telegram/SourceFiles/gui/flattextarea.cpp index ab76cdcda0..e592e389b6 100644 --- a/Telegram/SourceFiles/gui/flattextarea.cpp +++ b/Telegram/SourceFiles/gui/flattextarea.cpp @@ -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); diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index afed215adc..a0c983c830 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -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",