d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-27 21:48:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Navigate to space when room is selected

Browse source 
fixes #1260
This commit is contained in:
Nicolas Werner 2023-01-07 01:39:08 +01:00
parent ed867f53c4
commit 388e0c28bd
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/RoomList.qml
View file

@ -257,9 +257,6 @@ Page {
onClicked: {
console.log("tapped " + roomId);
if (isSpace && Communities.currentTagId != "space:"+roomId)
Communities.currentTagId = "space:"+roomId;
if (!Rooms.currentRoom || Rooms.currentRoom.roomId !== roomId)
Rooms.setCurrentRoom(roomId);
else

3
src/timeline/CommunitiesModel.cpp
View file

@ -579,6 +579,9 @@ CommunitiesModel::sync(const mtx::responses::Sync &sync_)
void
CommunitiesModel::setCurrentTagId(const QString &tagId)
{
if (currentTagId_ == tagId)
return;
if (tagId.startsWith(QLatin1String("tag:"))) {
auto tag = tagId.mid(4);
for (const auto &t : qAsConst(tags_)) {

4
src/timeline/RoomlistModel.cpp
View file

@ -768,6 +768,10 @@ RoomlistModel::setCurrentRoom(const QString &roomid)
currentRoomPreview_.reset();
emit currentRoomChanged(currentRoom_->roomId());
nhlog::ui()->debug("Switched to: {}", roomid.toStdString());
if (currentRoom_->isSpace()) {
emit spaceSelected(roomid);
}
} else if (invites.contains(roomid) || previewedRooms.contains(roomid)) {
currentRoom_ = nullptr;
std::optional<RoomInfo> i;

1
src/timeline/RoomlistModel.h
View file

@ -129,6 +129,7 @@ signals:
void totalUnreadMessageCountUpdated(int unreadMessages);
void currentRoomChanged(QString currentRoomId);
void fetchedPreview(QString roomid, RoomInfo info);
void spaceSelected(QString roomId);
private:
void addRoom(const QString &room_id, bool suppressInsertNotification = false);

3
src/timeline/TimelineViewManager.cpp
View file

@ -152,6 +152,9 @@ TimelineViewManager::TimelineViewManager(CallManager *, ChatPage *parent)
isConnected_ = true;
emit isConnectedChanged(true);
});
connect(rooms_, &RoomlistModel::spaceSelected, communities_, [this](QString roomId) {
communities_->setCurrentTagId("space:" + roomId);
});
}
void