diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f4f3d0fe..ae26af34f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - File viewer in chats (Image/Animated Image/Video/Texts) with the option to export the file. - Accept/decline CLI commands. +### Fixed +- Display hidden scrollbars. + ## 5.0.8 - 2023-01-20 ### Fixed diff --git a/linphone-app/src/app/single-application/SingleApplication.cpp b/linphone-app/src/app/single-application/SingleApplication.cpp index 1cdb724d9..6ff07eb2c 100644 --- a/linphone-app/src/app/single-application/SingleApplication.cpp +++ b/linphone-app/src/app/single-application/SingleApplication.cpp @@ -224,8 +224,7 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType) #ifdef Q_OS_UNIX void SingleApplicationPrivate::terminate (int signum) { - Q_UNUSED(signum); - SingleApplication::instance()->quit(); + SingleApplication::instance()->exit(signum); } #endif // ifdef Q_OS_UNIX diff --git a/linphone-app/src/app/single-application/SingleApplicationDBus.cpp b/linphone-app/src/app/single-application/SingleApplicationDBus.cpp index 112cad857..675fa8e14 100644 --- a/linphone-app/src/app/single-application/SingleApplicationDBus.cpp +++ b/linphone-app/src/app/single-application/SingleApplicationDBus.cpp @@ -56,8 +56,7 @@ void SingleApplicationPrivate::startSecondary () { } void SingleApplicationPrivate::terminate (int signum) { - Q_UNUSED(signum) - SingleApplication::instance()->quit(); + SingleApplication::instance()->exit(signum); } SingleApplication::SingleApplication (int &argc, char *argv[], bool allowSecondary, Options options, int) diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp index a4412cddb..dc551eefc 100644 --- a/linphone-app/src/components/settings/SettingsModel.cpp +++ b/linphone-app/src/components/settings/SettingsModel.cpp @@ -91,8 +91,10 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) { emit vfsEncryptedChanged(); if(mVfsUtils.needToDeleteUserData()) Utils::deleteAllUserData(); - else + else{ + qInfo() << "Exiting App from VFS settings"; App::getInstance()->quit(); + } } }); diff --git a/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml b/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml index ce749b8b5..0b8595863 100644 --- a/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml +++ b/linphone-app/ui/modules/Common/Form/Tab/TabContainer.qml @@ -18,9 +18,13 @@ Rectangle { spacing: 0 Flickable { - ScrollBar.vertical: ForceScrollBar { - id: scrollBar - } + id: flickable + ScrollBar.vertical: ForceScrollBar { + id: scrollBar + contentSizeTarget: flickable.contentHeight + sizeTarget: flickable.height + Component.onCompleted: updatePolicy() + } Layout.fillHeight: true Layout.fillWidth: true diff --git a/linphone-app/ui/views/App/Main/ContactEdit.qml b/linphone-app/ui/views/App/Main/ContactEdit.qml index 3be929f7d..54d917a7b 100644 --- a/linphone-app/ui/views/App/Main/ContactEdit.qml +++ b/linphone-app/ui/views/App/Main/ContactEdit.qml @@ -279,7 +279,11 @@ ColumnLayout { Flickable { id: flick - ScrollBar.vertical: ForceScrollBar {} + ScrollBar.vertical: ForceScrollBar { + contentSizeTarget: flick.contentHeight + sizeTarget: flick.height + Component.onCompleted: updatePolicy() + } anchors.fill: parent boundsBehavior: Flickable.StopAtBounds diff --git a/linphone-app/ui/views/App/Main/Dialogs/About.qml b/linphone-app/ui/views/App/Main/Dialogs/About.qml index b1ed23ac7..1a5fa6c66 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/About.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/About.qml @@ -110,7 +110,7 @@ DialogPlus { color: AboutStyle.copyrightBlock.url.colorModel.color linkColor: AboutStyle.copyrightBlock.url.colorModel.color //: 'Help us translate %1' : %1 is the application name - text: ''+qsTr('aboutTranslation').arg(applicationName)+'' + text: ''+qsTr('aboutTranslation').arg(applicationName)+'' textFormat: Text.RichText width: parent.width diff --git a/linphone-app/ui/views/App/Main/MainWindow.js b/linphone-app/ui/views/App/Main/MainWindow.js index 187a45e16..81711be64 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.js +++ b/linphone-app/ui/views/App/Main/MainWindow.js @@ -38,6 +38,7 @@ function handleActiveFocusItemChanged (activeFocusItem) { function handleClosing (close) { if (Linphone.SettingsModel.exitOnClose) { + console.info("Exiting App from MainWindow"); Qt.quit() return } diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml index 3ed5c75b6..458b43f69 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.qml +++ b/linphone-app/ui/views/App/Main/MainWindow.qml @@ -43,7 +43,7 @@ ApplicationWindow { minimumHeight: MainWindowStyle.minimumHeight minimumWidth: MainWindowStyle.minimumWidth - title: Utils.capitalizeFirstLetter(Qt.application.name) + title: Utils.capitalizeFirstLetter(applicationName) // --------------------------------------------------------------------------- diff --git a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml index 5eafac0f1..e974df614 100644 --- a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml +++ b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml @@ -38,7 +38,10 @@ Item { context: Qt.ApplicationShortcut sequence: StandardKey.Quit - onActivated: Qt.quit() + onActivated: { + console.info("Exiting App from Menu"); + Qt.quit() + } } Shortcut { diff --git a/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml index a4e8e8476..ed4ae1d25 100644 --- a/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml +++ b/linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml @@ -55,7 +55,10 @@ MenuBar { MenuItem { text: qsTr('quit') role: MenuItem.QuitRole - onTriggered: Qt.quit() + onTriggered: { + console.info("Exiting App from Top Menu"); + Qt.quit() + } shortcut: StandardKey.Quit }