Tweaked the logic of moving reactions into the view (#543)
There's no need to reposition list items if reactions bar are already fully visible.
This commit is contained in:
parent
c42d030d02
commit
cf7b706582
2 changed files with 11 additions and 8 deletions
|
@ -333,11 +333,15 @@ ListItem {
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
Debug.log("Show item completely timer triggered, requested index: " + requestedIndex + ", current index: " + index)
|
Debug.log("Show item completely timer triggered, requested index: " + requestedIndex + ", current index: " + index)
|
||||||
if (requestedIndex === index) {
|
if (requestedIndex === index) {
|
||||||
chatView.highlightMoveDuration = -1;
|
var p = chatView.contentItem.mapFromItem(reactionsColumn, 0, 0)
|
||||||
chatView.highlightResizeDuration = -1;
|
if (chatView.contentY > p.y || p.y + reactionsColumn.height > chatView.contentY + chatView.height) {
|
||||||
chatView.scrollToIndex(requestedIndex);
|
Debug.log("Moving reactions for item at", requestedIndex, "info the view")
|
||||||
chatView.highlightMoveDuration = 0;
|
chatView.highlightMoveDuration = -1
|
||||||
chatView.highlightResizeDuration = 0;
|
chatView.highlightResizeDuration = -1
|
||||||
|
chatView.scrollToIndex(requestedIndex, height <= chatView.height ? ListView.Contain : ListView.End)
|
||||||
|
chatView.highlightMoveDuration = 0
|
||||||
|
chatView.highlightResizeDuration = 0
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1235,10 +1235,9 @@ Page {
|
||||||
manuallyScrolledToBottom = chatView.atYEnd
|
manuallyScrolledToBottom = chatView.atYEnd
|
||||||
}
|
}
|
||||||
|
|
||||||
function scrollToIndex(index) {
|
function scrollToIndex(index, mode) {
|
||||||
if(index > 0 && index < chatView.count) {
|
if(index > 0 && index < chatView.count) {
|
||||||
positionViewAtIndex(index, ListView.Contain)
|
positionViewAtIndex(index, (mode === undefined) ? ListView.Contain : mode)
|
||||||
// currentIndex = index;
|
|
||||||
if(index === chatView.count - 1) {
|
if(index === chatView.count - 1) {
|
||||||
manuallyScrolledToBottom = true;
|
manuallyScrolledToBottom = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue