From df3f3a4da10a7a9f03b96034105d2e8dec6b8437 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Mon, 13 Jan 2020 06:54:59 -0800 Subject: [PATCH] Update libQuotient and fix CI. --- .gitlab-ci.yml | 1 + imports/Spectral/Panel/RoomPanel.qml | 5 ++++- include/libQuotient | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5cb60609..fb3d4fa65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ build-appimage: stage: build script: - git clone https://gitlab.matrix.org/matrix-org/olm.git && cd olm + - git checkout tags/0.29.0 - cmake . -Bbuild -LA -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DBUILD_SHARED_LIBS=NO - cmake --build build --target install --parallel $(nproc) - cd .. diff --git a/imports/Spectral/Panel/RoomPanel.qml b/imports/Spectral/Panel/RoomPanel.qml index c85ab5b07..377c6e5ab 100644 --- a/imports/Spectral/Panel/RoomPanel.qml +++ b/imports/Spectral/Panel/RoomPanel.qml @@ -226,6 +226,10 @@ Item { boundsBehavior: Flickable.DragOverBounds + onModelChanged: { + messageListView.positionViewAtBeginning() + } + model: SortFilterProxyModel { id: sortedMessageEventModel @@ -239,7 +243,6 @@ Item { onModelReset: { movingTimer.stop() - messageListView.positionViewAtBeginning() if (currentRoom) { movingTimer.restart() diff --git a/include/libQuotient b/include/libQuotient index 3accf7dfd..ac48199de 160000 --- a/include/libQuotient +++ b/include/libQuotient @@ -1 +1 @@ -Subproject commit 3accf7dfd82e8e14a7f90a8debee921f2f428679 +Subproject commit ac48199de174aa8cca52e703a3e65034fcd5db07