summary refs log tree commit diff
path: root/src/timeline
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-02-19 14:03:42 +0000
committerGitHub <noreply@github.com>2021-02-19 14:03:42 +0000
commit99efe2f06b310a8d5398fcb7647b99c269872e4e (patch)
treed6f5f0734a6e06a15c96ed69f6afdbd61ea24732 /src/timeline
parentMerge pull request #474 from Jedi18/room_settings_qml (diff)
parentcheck for empty alias and percent encoding for alias in url (diff)
downloadnheko-99efe2f06b310a8d5398fcb7647b99c269872e4e.tar.xz
Merge pull request #479 from Jedi18/add_rooms_model_completer
Add rooms completion model
Diffstat (limited to 'src/timeline')
-rw-r--r--src/timeline/InputBar.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp

index 08cbd15b..5ef38ac7 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp
@@ -19,6 +19,7 @@ #include "MainWindow.h" #include "MatrixClient.h" #include "Olm.h" +#include "RoomsModel.h" #include "TimelineModel.h" #include "TimelineViewManager.h" #include "UserSettingsPage.h" @@ -186,6 +187,11 @@ InputBar::completerFor(QString completerName) auto proxy = new CompletionProxyModel(emojiModel); emojiModel->setParent(proxy); return proxy; + } else if (completerName == "room") { + auto roomModel = new RoomsModel(true); + auto proxy = new CompletionProxyModel(roomModel); + roomModel->setParent(proxy); + return proxy; } return nullptr; }