diff options
Diffstat (limited to 'Swift/QtUI/QtEmojisScroll.cpp')
-rw-r--r-- | Swift/QtUI/QtEmojisScroll.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Swift/QtUI/QtEmojisScroll.cpp b/Swift/QtUI/QtEmojisScroll.cpp index 2c347bb..be505b6 100644 --- a/Swift/QtUI/QtEmojisScroll.cpp +++ b/Swift/QtUI/QtEmojisScroll.cpp @@ -1,32 +1,38 @@ /* * Copyright (c) 2016-2017 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/QtEmojisScroll.h> #include <QLayout> #include <QScrollArea> #include <QStyle> +#include <Swiften/Base/Platform.h> + #include <Swift/QtUI/QtEmojisGrid.h> #include <Swift/QtUI/QtRecentEmojisGrid.h> namespace Swift { QtEmojisScroll::QtEmojisScroll(QLayout* emojiLayout, QWidget *parent) : QWidget(parent) { auto selector = new QWidget(); auto scrollArea = new QScrollArea(); scrollArea->setWidgetResizable(true); scrollArea->setWidget(selector); selector->setLayout(emojiLayout); this->setLayout(new QVBoxLayout); this->layout()->addWidget(scrollArea); this->layout()->setContentsMargins(0,0,0,0); if (emojiLayout->itemAt(0)) { +#ifdef SWIFTEN_PLATFORM_MACOSX setMinimumHeight(emojiLayout->itemAt(0)->minimumSize().height() * 8); +#else + setMinimumHeight(emojiLayout->itemAt(0)->minimumSize().height() * 2); +#endif } } } |