From c2b246409fc8ff1b6dcfa5b740b45c8d38d02519 Mon Sep 17 00:00:00 2001 From: PKEv Date: Thu, 2 Jul 2015 21:37:09 +0300 Subject: [PATCH] add max size of emoji fix #1691 max size is calculated from the possibility of fully display the selection window of emoji and value Qt::AA_UseHighDpiPixmaps. --- src/widget/form/settings/generalform.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp index 52f2301ef..3ce78e25c 100644 --- a/src/widget/form/settings/generalform.cpp +++ b/src/widget/form/settings/generalform.cpp @@ -29,6 +29,7 @@ #include "src/persistence/profile.h" #include "src/widget/translator.h" #include "src/net/autoupdate.h" +#include #include #include #include @@ -385,6 +386,12 @@ void GeneralForm::reloadSmiles() bodyUI->smile3->setToolTip(smiles[2]); bodyUI->smile4->setToolTip(smiles[3]); bodyUI->smile5->setToolTip(smiles[4]); + + //set maximum size of emoji + QDesktopWidget desktop; + int maxSize = qMin(desktop.geometry().height()/8, + desktop.geometry().width()/8); // 8 is the count of row and column in emoji's in widget + bodyUI->emoticonSize->setMaximum(SmileyPack::getInstance().getAsIcon(smiles[0]).actualSize(QSize(maxSize,maxSize)).width()); } void GeneralForm::onCheckUpdateChanged()