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

Optimized the emoticon selector box size based on how many emoticons are loaded (by anmo), update emotes.acs

Browse Source
This commit is contained in:
defnax 2015-12-22 19:57:26 +01:00
parent 334b414335
commit 95d8647a7e
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
retroshare-gui/src/gui/common/Emoticons.cpp
View File

@ -29,7 +29,7 @@
#include <QPushButton> #include <QPushButton>
#include <iostream> #include <iostream>
#include <math.h>
#include "Emoticons.h" #include "Emoticons.h"
#include "util/HandleRichText.h" #include "util/HandleRichText.h"
@ -128,9 +128,9 @@ void Emoticons::showSmileyWidget(QWidget *parent, QWidget *button, const char *s
const int buttonWidth = 26; const int buttonWidth = 26;
const int buttonHeight = 26; const int buttonHeight = 26;
const int countPerLine = 14;
int rowCount = (Smileys.size()/countPerLine) + ((Smileys.size() % countPerLine) ? 1 : 0); int rowCount = (int)sqrt((double)Smileys.size());
int countPerLine = (Smileys.size()/rowCount) + ((Smileys.size() % rowCount) ? 1 : 0);
smWidget->setAttribute( Qt::WA_DeleteOnClose); smWidget->setAttribute( Qt::WA_DeleteOnClose);
smWidget->setWindowTitle("Emoticons"); smWidget->setWindowTitle("Emoticons");

1
retroshare-gui/src/gui/emojione.qrc
View File

@ -529,6 +529,7 @@
<file>emojione/2614.png</file> <file>emojione/2614.png</file>
<file>emojione/2615.png</file> <file>emojione/2615.png</file>
<file>emojione/2708.png</file> <file>emojione/2708.png</file>
<file>emojione/2744.png</file>
<file>emojione/2764.png</file> <file>emojione/2764.png</file>
<file>emojione/2934.png</file> <file>emojione/2934.png</file>
<file>emojione/2935.png</file> <file>emojione/2935.png</file>

8
retroshare-gui/src/gui/emojione/emotes.acs
View File

@ -59,7 +59,7 @@
":mask:":"emojione/1F637.png"; ":mask:":"emojione/1F637.png";
":slight_frown:|:slightly_frowning_face:":"emojione/1F641.png"; ":slight_frown:|:slightly_frowning_face:":"emojione/1F641.png";
":slight_smile:|:slightly_smiling_face:":"emojione/1F642.png"; ":slight_smile:|:slightly_smiling_face:":"emojione/1F642.png";
":smile_cat:":"emojione/1F638.png"; ":smile_cat:|(@)":"emojione/1F638.png";
":joy_cat:":"emojione/1F639.png"; ":joy_cat:":"emojione/1F639.png";
":smiley_cat:":"emojione/1F63A.png"; ":smiley_cat:":"emojione/1F63A.png";
":heart_eyes_cat:":"emojione/1F63B.png"; ":heart_eyes_cat:":"emojione/1F63B.png";
@ -115,7 +115,7 @@
":thumbsdown:|:-1:":"emojione/1F44E.png"; ":thumbsdown:|:-1:":"emojione/1F44E.png";
":muscle:":"emojione/1F4AA.png"; ":muscle:":"emojione/1F4AA.png";
":middle_finger:|":"emojione/1F595.png"; ":middle_finger:|":"emojione/1F595.png";
":coffee:":"emojione/2615.png"; ":coffee:|(C)|(c)":"emojione/2615.png";
":sake:":"emojione/1F376.png"; ":sake:":"emojione/1F376.png";
":tea:":"emojione/1F375.png"; ":tea:":"emojione/1F375.png";
":cake:":"emojione/1F370.png"; ":cake:":"emojione/1F370.png";
@ -125,7 +125,7 @@
":wine_glass:":"emojione/1F377.png"; ":wine_glass:":"emojione/1F377.png";
":cocktail:":"emojione/1F378.png"; ":cocktail:":"emojione/1F378.png";
":tropical_drink:":"emojione/1F379.png"; ":tropical_drink:":"emojione/1F379.png";
":beer:":"emojione/1F37A.png"; ":beer:|(B)|(b)":"emojione/1F37A.png";
":beers:":"emojione/1F37B.png"; ":beers:":"emojione/1F37B.png";
":watch:":"emojione/231A.png"; ":watch:":"emojione/231A.png";
":iphone:":"emojione/1F4F1.png"; ":iphone:":"emojione/1F4F1.png";
@ -135,7 +135,7 @@
":speak_no_evil:":"emojione/1F64A.png"; ":speak_no_evil:":"emojione/1F64A.png";
":turtle:":"emojione/1F422.png"; ":turtle:":"emojione/1F422.png";
":frog:":"emojione/1F438.png"; ":frog:":"emojione/1F438.png";
":airplane:":"emojione/2708.png"; ":airplane:|(C)|(c)":"emojione/2708.png";
":heart:|<3":"emojione/2764.png"; ":heart:|<3":"emojione/2764.png";
":broken_heart:|</3":"emojione/1F494.png"; ":broken_heart:|</3":"emojione/1F494.png";
":love_letter:":"emojione/1F48C.png"; ":love_letter:":"emojione/1F48C.png";