Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-03-07 19:32:56 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-03-07 19:33:22 (GMT) |
| commit | 121361e37bc2cc8ab1eae2f2aea92975a62e5511 (patch) | |
| tree | 99860dadea0a8622c83ebc2cc1feada7b8e7e4b2 /Swift/QtUI/QtEmojisScroll.cpp | |
| parent | 639db5f27911c4bc994e6a040561d596a0f77113 (diff) | |
| download | swift-121361e37bc2cc8ab1eae2f2aea92975a62e5511.zip swift-121361e37bc2cc8ab1eae2f2aea92975a62e5511.tar.bz2 | |
Use text-based emoticons on Linux and Windows
The new unicode-based emoji dialog currently only provides
a good experience on macOS.
This commit enables the unicode-based emoji dialog on macOS
and uses the text-based emoticons on Linux and Windows.
Test-Information:
Tested on macOS 10.12.3 with Qt 5.5.1 and Windows 8 with Qt
5.5.1.
Change-Id: Ibee20eacafa5788bcdf5a46e1ceac713a28a0383
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 } } } |