Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 06:02:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to fix emoticons sizes on high DPI screens

Browse source
This commit is contained in:
csoler 2016-11-26 11:22:35 +01:00
parent 3386238f35
commit 4ef1b08ee8
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -164,8 +164,8 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
smGLayout->addWidget(smTab); smGLayout->addWidget(smTab);
} }
const int buttonWidth = QFontMetricsF(smWidget->font()).height()*2; const int buttonWidth = QFontMetricsF(smWidget->font()).height()*1.2;
const int buttonHeight = QFontMetricsF(smWidget->font()).height()*2; const int buttonHeight = QFontMetricsF(smWidget->font()).height()*1.2;
int maxRowCount = 0; int maxRowCount = 0;
int maxCountPerLine = 0; int maxCountPerLine = 0;
@ -179,7 +179,12 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
if (! bOnlyOneGroup) if (! bOnlyOneGroup)
{ {
tabGrpWidget = new QWidget(smTab); tabGrpWidget = new QWidget(smTab);
smTab->setIconSize(QSize(24,24));
// (Cyril) Never use an absolute size. It needs to be scaled to the actual font size on the screen.
//
QFontMetricsF fm(parent->font()) ;
smTab->setIconSize(QSize(32*fm.height()/14.0,32*fm.height()/14.0));
if (groupName.right(4).toLower() == ".png") if (groupName.right(4).toLower() == ".png")
smTab->addTab( tabGrpWidget, QIcon(groupName), ""); smTab->addTab( tabGrpWidget, QIcon(groupName), "");
else else