parent
d073dd215a
commit
6f8f9b6f76
|
@ -77,9 +77,16 @@ StatusAppThreePanelLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
showRightPanel: {
|
showRightPanel: {
|
||||||
// Check if user list is available as an option for particular chat content module.
|
if (!localAccountSensitiveSettings.showOnlineUsers || !localAccountSensitiveSettings.expandUsersList) {
|
||||||
let usersListAvailable = root.rootStore.currentChatContentModule().chatDetails.isUsersListAvailable
|
return false
|
||||||
return localAccountSensitiveSettings.showOnlineUsers && usersListAvailable && localAccountSensitiveSettings.expandUsersList
|
}
|
||||||
|
let chatContentModule = root.rootStore.currentChatContentModule()
|
||||||
|
if (!chatContentModule) {
|
||||||
|
// New communities have no chats, so no chatContentModule
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
// Check if user list is available as an option for particular chat content module
|
||||||
|
return chatContentModule.chatDetails.isUsersListAvailable
|
||||||
}
|
}
|
||||||
|
|
||||||
rightPanel: localAccountSensitiveSettings.communitiesEnabled && root.rootStore.chatCommunitySectionModule.isCommunity()?
|
rightPanel: localAccountSensitiveSettings.communitiesEnabled && root.rootStore.chatCommunitySectionModule.isCommunity()?
|
||||||
|
@ -92,6 +99,10 @@ StatusAppThreePanelLayout {
|
||||||
messageContextMenu: quickActionMessageOptionsMenu
|
messageContextMenu: quickActionMessageOptionsMenu
|
||||||
usersModule: {
|
usersModule: {
|
||||||
let chatContentModule = root.rootStore.currentChatContentModule()
|
let chatContentModule = root.rootStore.currentChatContentModule()
|
||||||
|
if (!chatContentModule || !chatContentModule.usersModule) {
|
||||||
|
// New communities have no chats, so no chatContentModule
|
||||||
|
return {}
|
||||||
|
}
|
||||||
return chatContentModule.usersModule
|
return chatContentModule.usersModule
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,7 +343,7 @@ Item {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: {
|
height: {
|
||||||
// I dont know why, the binding doesn't work well if this isn't here
|
// I dont know why, the binding doesn't work well if this isn't here
|
||||||
item.height
|
item && item.height
|
||||||
return this.active ? item.height : 0
|
return this.active ? item.height : 0
|
||||||
}
|
}
|
||||||
anchors.top: communityChatListAndCategories.bottom
|
anchors.top: communityChatListAndCategories.bottom
|
||||||
|
|
Loading…
Reference in New Issue