1 files changed, 2 insertions, 7 deletions
diff --git a/Swift/QtUI/QtEmojisSelector.cpp b/Swift/QtUI/QtEmojisSelector.cpp
index 62ed862..fe2f235 100644
--- a/Swift/QtUI/QtEmojisSelector.cpp
+++ b/Swift/QtUI/QtEmojisSelector.cpp
@@ -26,3 +26,2 @@ namespace Swift {
     QtEmojisSelector::QtEmojisSelector(QSettings* settings, const std::map<std::string, std::string>& emoticonsMap, QWidget* parent) : QTabWidget(parent), settings_(settings), emoticonsMap_(emoticonsMap) {
-#ifdef SWIFTEN_PLATFORM_MACOSX
         recentEmojisGrid_ = addRecentTab();
@@ -36,7 +35,5 @@ namespace Swift {
         }
-
         loadSettings();
-#else
-        setupEmoticonsTab();
-#endif
+        //The size of an emoji cell varies depending the OS, 42 is the ceil value.
+        setFixedSize(QSize(EmojiMapper::emojisInCategory.size() * 42, 300));
     }
@@ -44,5 +41,3 @@ namespace Swift {
     QtEmojisSelector::~QtEmojisSelector() {
-#ifdef SWIFTEN_PLATFORM_MACOSX
         writeSettings();
-#endif
     }