mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge branch 'pr1957'
This commit is contained in:
commit
83d7b5f02b
|
@ -29,6 +29,7 @@
|
||||||
#include "src/persistence/profile.h"
|
#include "src/persistence/profile.h"
|
||||||
#include "src/widget/translator.h"
|
#include "src/widget/translator.h"
|
||||||
#include "src/net/autoupdate.h"
|
#include "src/net/autoupdate.h"
|
||||||
|
#include <QDesktopWidget>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QStyleFactory>
|
#include <QStyleFactory>
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
|
@ -385,6 +386,12 @@ void GeneralForm::reloadSmiles()
|
||||||
bodyUI->smile3->setToolTip(smiles[2]);
|
bodyUI->smile3->setToolTip(smiles[2]);
|
||||||
bodyUI->smile4->setToolTip(smiles[3]);
|
bodyUI->smile4->setToolTip(smiles[3]);
|
||||||
bodyUI->smile5->setToolTip(smiles[4]);
|
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()
|
void GeneralForm::onCheckUpdateChanged()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user