From 733702b781f9563e6c634f5f5ee47931add06a79 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Fri, 22 Nov 2024 14:21:32 +0100 Subject: [PATCH] fix #LINQT-1433 highlight and position view at current index meeting list --- Linphone/core/conference/ConferenceInfoList.cpp | 4 ++-- Linphone/view/Control/Display/Meeting/MeetingListView.qml | 1 + Linphone/view/Page/Main/Meeting/MeetingPage.qml | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Linphone/core/conference/ConferenceInfoList.cpp b/Linphone/core/conference/ConferenceInfoList.cpp index 5abb5c34..dfe9dcd7 100644 --- a/Linphone/core/conference/ConferenceInfoList.cpp +++ b/Linphone/core/conference/ConferenceInfoList.cpp @@ -88,9 +88,9 @@ void ConferenceInfoList::setSelf(QSharedPointer me) { // int index2; // get(mLastConfInfoInserted.get(), &index2); if (index != -1) setCurrentDateIndex(index); - else setCurrentDateIndex(mHaveCurrentDate ? currentDateIndex + 1 : currentDateIndex); + else setCurrentDateIndex(mHaveCurrentDate ? currentDateIndex : currentDateIndex + 1); mLastConfInfoInserted = nullptr; - } else setCurrentDateIndex(mHaveCurrentDate ? currentDateIndex + 1 : currentDateIndex); + } else setCurrentDateIndex(mHaveCurrentDate ? currentDateIndex : currentDateIndex + 1); delete items; }); }); diff --git a/Linphone/view/Control/Display/Meeting/MeetingListView.qml b/Linphone/view/Control/Display/Meeting/MeetingListView.qml index d114be0d..381ee4ab 100644 --- a/Linphone/view/Control/Display/Meeting/MeetingListView.qml +++ b/Linphone/view/Control/Display/Meeting/MeetingListView.qml @@ -28,6 +28,7 @@ ListView { } onCurrentIndexChanged: { selectedConference = model.getAt(currentIndex) || null + positionViewAtIndex(currentIndex, ListView.Center) } onVisibleChanged: if( visible) { mainItem.positionViewAtIndex(currentIndex, ListView.Center)// First approximative move diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index ec7125fe..02bb7349 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -188,9 +188,6 @@ AbstractMainPage { Layout.fillWidth: true Layout.fillHeight: true - preferredHighlightBegin: height/2 - 10 - preferredHighlightEnd: height/2 + 10 - highlightRangeMode: ListView.ApplyRange onCountChanged: mainItem.meetingListCount = count searchBarText: searchBar.text Keys.onPressed: (event) => {