fix focus for key binding in chat message lit
fix participant info view
This commit is contained in:
parent
6ccbdf6ef8
commit
a7f3476568
3 changed files with 25 additions and 25 deletions
|
|
@ -447,7 +447,6 @@ ListView {
|
||||||
} else {
|
} else {
|
||||||
mainItem.chatClicked(modelData)
|
mainItem.chatClicked(modelData)
|
||||||
mainItem.currentIndex = model.index
|
mainItem.currentIndex = model.index
|
||||||
mainItem.forceActiveFocus()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,10 @@ ListView {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
onChatChanged: lastItemVisible = false
|
onChatChanged: {
|
||||||
|
lastItemVisible = false
|
||||||
|
forceActiveFocus()
|
||||||
|
}
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
visible: !mainItem.lastItemVisible
|
visible: !mainItem.lastItemVisible
|
||||||
|
|
|
||||||
|
|
@ -38,20 +38,23 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle {
|
Control.Control {
|
||||||
visible: expandButton.checked
|
visible: expandButton.checked
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: Math.round(9 * DefaultStyle.dp)
|
Layout.topMargin: Math.round(9 * DefaultStyle.dp)
|
||||||
color: DefaultStyle.grey_100
|
height: Math.min(contentColumn.implicitHeight, Math.round(90 * DefaultStyle.dp))
|
||||||
radius: Math.round(15 * DefaultStyle.dp)
|
bottomPadding: Math.round(15 * DefaultStyle.dp)
|
||||||
height: participants.length > 0 ? contentColumn.implicitHeight : Math.round(90 * DefaultStyle.dp)
|
|
||||||
|
|
||||||
ColumnLayout {
|
background: Rectangle {
|
||||||
id: contentColumn
|
color: DefaultStyle.grey_100
|
||||||
anchors.fill: parent
|
radius: Math.round(15 * DefaultStyle.dp)
|
||||||
spacing: Math.round(16 * DefaultStyle.dp)
|
}
|
||||||
|
|
||||||
Item {
|
contentItem: ColumnLayout {
|
||||||
|
id: contentColumn
|
||||||
|
spacing: Math.round(16 * DefaultStyle.dp)
|
||||||
|
|
||||||
|
Item {
|
||||||
Layout.topMargin: Math.round(7 * DefaultStyle.dp)
|
Layout.topMargin: Math.round(7 * DefaultStyle.dp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -119,8 +122,8 @@ ColumnLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
//: "Show contact"
|
//: "Show contact"
|
||||||
text: contact && contact.core && contact.core.isAppFriend ? qsTr("menu_see_existing_contact") :
|
text: contact && contact.core && contact.core.isAppFriend ? qsTr("menu_see_existing_contact") :
|
||||||
//: "Add to contacts"
|
//: "Add to contacts"
|
||||||
qsTr("menu_add_address_to_contacts")
|
qsTr("menu_add_address_to_contacts")
|
||||||
icon.source: (contact && contact.core && contact.core.isAppFriend)
|
icon.source: (contact && contact.core && contact.core.isAppFriend)
|
||||||
? AppIcons.adressBook
|
? AppIcons.adressBook
|
||||||
: AppIcons.plusCircle
|
: AppIcons.plusCircle
|
||||||
|
|
@ -188,11 +191,11 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MediumButton {
|
MediumButton {
|
||||||
id: manageParticipants
|
id: manageParticipants
|
||||||
visible: mainItem.isGroupEditable()
|
visible: mainItem.isGroupEditable()
|
||||||
|
|
@ -205,12 +208,7 @@ ColumnLayout {
|
||||||
style: ButtonStyle.secondary
|
style: ButtonStyle.secondary
|
||||||
onClicked: mainItem.manageParticipantsRequested()
|
onClicked: mainItem.manageParticipantsRequested()
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
Layout.bottomMargin: Math.round(17 * DefaultStyle.dp)
|
|
||||||
}
|
}
|
||||||
Item {
|
}
|
||||||
visible: !manageParticipants.visible
|
}
|
||||||
Layout.bottomMargin: Math.round(7 * DefaultStyle.dp)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue