mirror of
https://github.com/status-im/status-desktop.git
synced 2025-03-02 23:41:18 +00:00
parent
c74d1086c0
commit
2ec0b5330a
@ -81,6 +81,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
|
||||
for chatDto in channelGroup.chats:
|
||||
var chatName = chatDto.name
|
||||
var chatImage = chatDto.icon
|
||||
var chatEmoji = chatDto.emoji
|
||||
var colorHash: ColorHashDto = @[]
|
||||
var colorId: int = 0
|
||||
let isOneToOneChat = chatDto.chatType == ChatType.OneToOne
|
||||
@ -91,7 +92,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
|
||||
let subItem = location_menu_sub_item.initSubItem(
|
||||
chatDto.id,
|
||||
chatName,
|
||||
chatImage,
|
||||
if (chatImage != ""): chatImage else: chatEmoji,
|
||||
"",
|
||||
chatDto.color,
|
||||
isOneToOneChat,
|
||||
|
@ -539,9 +539,6 @@ ColumnLayout {
|
||||
isAdmin: true
|
||||
asset.isLetterIdenticon: true
|
||||
isUntrustworthy: true
|
||||
Component.onCompleted: {
|
||||
print(asset.name, asset.isImage, asset.isLetterIdenticon)
|
||||
}
|
||||
}
|
||||
|
||||
StatusBaseText {
|
||||
|
@ -16,4 +16,4 @@ Image {
|
||||
mipmap: true
|
||||
antialiasing: true
|
||||
source: emojiId ? `../../assets/twemoji/svg/${emojiId}.svg` : ""
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ Loader {
|
||||
border.color: Theme.palette.directColor7
|
||||
color: root.asset.imgIsIdenticon ?
|
||||
Theme.palette.statusRoundedImage.backgroundColor :
|
||||
"transparent"
|
||||
root.asset.bgColor
|
||||
}
|
||||
Loader {
|
||||
anchors.centerIn: parent
|
||||
|
@ -111,7 +111,7 @@ MenuItem {
|
||||
sourceComponent: {
|
||||
let subMenuItemIcon = statusPopupMenu.subMenuItemIcons && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex]
|
||||
|
||||
if ((parent.subMenu && subMenuItemIcon && subMenuItemIcon.source) ||
|
||||
if ((parent.subMenu && subMenuItemIcon && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex].source) ||
|
||||
statusPopupMenuItem.action.assetSettings && !!statusPopupMenuItem.action.assetSettings.name.toString()
|
||||
&& statusPopupMenuItem.action.assetSettings.isImage) {
|
||||
return statusRoundImageCmp
|
||||
|
@ -5,6 +5,7 @@ import QtQuick.Controls 2.14
|
||||
import StatusQ.Core 0.1
|
||||
import StatusQ.Core.Theme 0.1
|
||||
import StatusQ.Popups 0.1
|
||||
import StatusQ.Core.Utils 0.1 as StatusQUtils
|
||||
|
||||
StatusPopupMenu {
|
||||
id: root
|
||||
@ -103,8 +104,10 @@ StatusPopupMenu {
|
||||
value: model.value
|
||||
text: model.text
|
||||
assetSettings.isImage: !!model.imageSource
|
||||
assetSettings.name: !!model.imageSource ? model.imageSource : model.iconName
|
||||
assetSettings.name: !!StatusQUtils.Emoji.iconSource(model.imageSource) ?
|
||||
StatusQUtils.Emoji.iconSource(model.imageSource) : model.imageSource
|
||||
assetSettings.color: model.isUserIcon ? Theme.palette.userCustomizationColors[model.colorId] : model.iconColor
|
||||
assetSettings.bgColor: model.iconColor
|
||||
assetSettings.charactersLen: model.isUserIcon ? 2 : 1
|
||||
ringSettings.ringSpecModel: model.colorHash
|
||||
onTriggered: {
|
||||
|
@ -14,6 +14,7 @@ MenuItem {
|
||||
property StatusAssetSettings assetSettings: StatusAssetSettings {
|
||||
height: 16
|
||||
width: 16
|
||||
isImage: (name.toString() !== "")
|
||||
isLetterIdenticon: (name.toString() === "")
|
||||
color: (name === "channel") ? Theme.palette.directColor1 : "transparent"
|
||||
letterSize: charactersLen > 1 ? 8 : 11
|
||||
|
Loading…
x
Reference in New Issue
Block a user