StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr1957'

Browse Source
This commit is contained in:
tux3 2015-07-04 13:36:20 +02:00
commit 83d7b5f02b
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widget/form/settings/generalform.cpp
View File

@ -29,6 +29,7 @@
#include "src/persistence/profile.h"
#include "src/widget/translator.h"
#include "src/net/autoupdate.h"
#include <QDesktopWidget>
#include <QMessageBox>
#include <QStyleFactory>
#include <QTime>
@ -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()