mirror of
https://github.com/overte-org/overte.git
synced 2025-08-11 05:53:07 +02:00
Merge pull request #1382 from Armored-Dragon/fix/ac_scrolling-distance_check
Fix Armored Chat always scrolling on a new message
This commit is contained in:
commit
e0bdffd470
1 changed files with 9 additions and 2 deletions
|
@ -21,6 +21,7 @@ Rectangle {
|
||||||
repeat: false
|
repeat: false
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
toScript({type: "initialized"});
|
toScript({type: "initialized"});
|
||||||
|
load_scroll_timer.bypassDistanceCheck = true
|
||||||
load_scroll_timer.running = true
|
load_scroll_timer.running = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,8 +30,12 @@ Rectangle {
|
||||||
interval: 100
|
interval: 100
|
||||||
running: false
|
running: false
|
||||||
repeat: false
|
repeat: false
|
||||||
|
|
||||||
|
property bool bypassDistanceCheck: false // One time event. Whether we should bypass the distance check, and scroll to the bottom regardless or not.
|
||||||
|
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
scrollToBottom(true);
|
scrollToBottom(bypassDistanceCheck);
|
||||||
|
bypassDistanceCheck = false; // Set the property to false, this was a one time event!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,6 +78,7 @@ Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
pageVal = "local";
|
pageVal = "local";
|
||||||
|
load_scroll_timer.bypassDistanceCheck = true;
|
||||||
load_scroll_timer.running = true;
|
load_scroll_timer.running = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -101,7 +107,8 @@ Rectangle {
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: {
|
onClicked: {
|
||||||
pageVal = "domain"
|
pageVal = "domain";
|
||||||
|
load_scroll_timer.bypassDistanceCheck = true;
|
||||||
load_scroll_timer.running = true;
|
load_scroll_timer.running = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue