close emoji autocompleter if space typed after : issue #433 and adds default option for emoji font family settings

pull/459/head
Jedi18 4 years ago
parent e0207ff337
commit f02342fe22
  1. 4
      resources/qml/MessageInput.qml
  2. 1
      src/UserSettingsPage.cpp

@ -163,6 +163,10 @@ Rectangle {
TimelineManager.timeline.input.paste(false); TimelineManager.timeline.input.paste(false);
event.accepted = true; event.accepted = true;
} else if (event.key == Qt.Key_Space) { } else if (event.key == Qt.Key_Space) {
// close popup if user enters space after colon
if(cursorPosition == completerTriggeredAt + 1)
popup.close();
if (popup.opened && popup.count <= 0) if (popup.opened && popup.count <= 0)
popup.close(); popup.close();

@ -725,6 +725,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
// TODO: Is there a way to limit to just emojis, rather than // TODO: Is there a way to limit to just emojis, rather than
// all emoji fonts? // all emoji fonts?
auto emojiFamilies = fontDb.families(QFontDatabase::Symbol); auto emojiFamilies = fontDb.families(QFontDatabase::Symbol);
emojiFontSelectionCombo_->addItem(QString("default"));
for (const auto &family : emojiFamilies) { for (const auto &family : emojiFamilies) {
emojiFontSelectionCombo_->addItem(family); emojiFontSelectionCombo_->addItem(family);
} }

Loading…
Cancel
Save