thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'quickswitcher_qml' of git://github.com/Jedi18/nheko into Jedi18-quickswitcher_qml

Browse source
This commit is contained in:
Nicolas Werner 2021-03-13 23:45:05 +01:00
commit 7a356f3832
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
18 changed files with 323 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ChatPage.cpp
View file

@ -23,7 +23,6 @@
#include "MainWindow.h"
#include "MatrixClient.h"
#include "Olm.h"
#include "QuickSwitcher.h"
#include "RoomList.h"
#include "SideBarActions.h"
#include "Splitter.h"
@ -589,18 +588,6 @@ ChatPage::loadStateFromCache()
emit trySyncCb();
}
void
ChatPage::showQuickSwitcher()
{
auto dialog = new QuickSwitcher(this);
connect(dialog, &QuickSwitcher::roomSelected, room_list_, &RoomList::highlightSelectedRoom);
connect(
dialog, &QuickSwitcher::closing, this, []() { MainWindow::instance()->hideOverlay(); });
MainWindow::instance()->showTransparentOverlayModal(dialog);
}
void
ChatPage::removeRoom(const QString &room_id)
{
@ -1456,3 +1443,9 @@ ChatPage::handleMatrixUri(const QUrl &uri)
{
handleMatrixUri(uri.toString(QUrl::ComponentFormattingOption::FullyEncoded).toUtf8());
}
void
ChatPage::highlightRoom(const QString &room_id)
{
room_list_->highlightSelectedRoom(room_id);
}