From cde6bc078849539c012b3aa0505a86fb63eac784 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Wed, 15 Jan 2025 16:03:12 +0100 Subject: [PATCH] fix #LINQT-1551 tabbar text size fix #LINQT-1552 do not show validation toast in conf fix #LINQT-1554 micro muted icon for user --- Linphone/view/Control/Button/Button.qml | 2 +- .../view/Control/Container/VerticalTabBar.qml | 21 ++++++++++++------- Linphone/view/Control/Display/Sticker.qml | 6 +++++- Linphone/view/Control/Input/TextField.qml | 3 ++- .../view/Control/Popup/InformationPopup.qml | 1 + .../view/Page/Form/Contact/ContactEdition.qml | 1 + .../Page/Form/Meeting/AddParticipantsForm.qml | 1 + .../view/Page/Window/Call/CallsWindow.qml | 1 + 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Linphone/view/Control/Button/Button.qml b/Linphone/view/Control/Button/Button.qml index a1e61fa67..9194da0d0 100644 --- a/Linphone/view/Control/Button/Button.qml +++ b/Linphone/view/Control/Button/Button.qml @@ -81,7 +81,7 @@ Control.Button { // color: buttonBackground.color == "transparent" ? "transparent" : "white" color: disabledFilterColor opacity: 0.5 - visible: !mainItem.enabled && mainItem.color != "transparent" + visible: !mainItem.enabled && mainItem.color.a !== 0 radius: mainItem.radius width: mainItem.width height: mainItem.height diff --git a/Linphone/view/Control/Container/VerticalTabBar.qml b/Linphone/view/Control/Container/VerticalTabBar.qml index 2a9fb7a44..495ff9eb5 100644 --- a/Linphone/view/Control/Container/VerticalTabBar.qml +++ b/Linphone/view/Control/Container/VerticalTabBar.qml @@ -92,7 +92,7 @@ Control.TabBar { height: visible && buttonIcon.isImageReady ? undefined : 0 bottomInset: 32 * DefaultStyle.dp topInset: 32 * DefaultStyle.dp - + hoverEnabled: true visible: modelData?.visible != undefined ? modelData?.visible : true UnreadNotification { unread: !defaultAccount @@ -106,12 +106,15 @@ Control.TabBar { anchors.rightMargin: 15 * DefaultStyle.dp anchors.top: parent.top } + MouseArea { + anchors.fill: tabButton + cursorShape: tabButton.hovered ? Qt.PointingHandCursor : Qt.ArrowCursor + acceptedButtons: Qt.NoButton + } contentItem: ColumnLayout { - // height: tabButton.height - // width: tabButton.width EffectImage { id: buttonIcon - property int buttonSize: 24 * DefaultStyle.dp + property int buttonSize: mainItem.currentIndex !== index && tabButton.hovered ? 26 * DefaultStyle.dp : 24 * DefaultStyle.dp imageSource: mainItem.currentIndex === index ? modelData.selectedIcon : modelData.icon Layout.preferredWidth: buttonSize Layout.preferredHeight: buttonSize @@ -125,10 +128,12 @@ Control.TabBar { visible: buttonIcon.isImageReady text: modelData.label font { - weight: mainItem.currentIndex === index ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp - pixelSize: 9 * DefaultStyle.dp - underline: tabButton.activeFocus || tabButton.hovered - bold: true + weight: mainItem.currentIndex === index + ? 800 * DefaultStyle.dp + : tabButton.hovered + ? 600 * DefaultStyle.dp + : 400 * DefaultStyle.dp + pixelSize: 11 * DefaultStyle.dp } color: DefaultStyle.grey_0 Layout.fillWidth: true diff --git a/Linphone/view/Control/Display/Sticker.qml b/Linphone/view/Control/Display/Sticker.qml index 6fc02e99a..1ea52fe3d 100644 --- a/Linphone/view/Control/Display/Sticker.qml +++ b/Linphone/view/Control/Display/Sticker.qml @@ -57,7 +57,11 @@ Item { || (participantDevice && participantDevice.core.videoEnabled) property string qmlName property bool displayAll : !!mainItem.call - property bool mutedStatus: participantDevice ? participantDevice.core.isMuted : false + property bool mutedStatus: participantDevice + ? participantDevice.core.isMuted + : account && call + ? call.core.conference && call.core.microphoneMuted + : false clip: false Rectangle { id: background diff --git a/Linphone/view/Control/Input/TextField.qml b/Linphone/view/Control/Input/TextField.qml index ca71d2377..42f60e2d0 100644 --- a/Linphone/view/Control/Input/TextField.qml +++ b/Linphone/view/Control/Input/TextField.qml @@ -2,7 +2,8 @@ import QtQuick import QtQuick.Controls.Basic as Control import QtQuick.Layouts import Linphone - +import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle + Control.TextField { id: mainItem property var customWidth diff --git a/Linphone/view/Control/Popup/InformationPopup.qml b/Linphone/view/Control/Popup/InformationPopup.qml index f6dc9a025..1ecd2589e 100644 --- a/Linphone/view/Control/Popup/InformationPopup.qml +++ b/Linphone/view/Control/Popup/InformationPopup.qml @@ -2,6 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls.Basic import Linphone +import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle Popup { id: mainItem diff --git a/Linphone/view/Page/Form/Contact/ContactEdition.qml b/Linphone/view/Page/Form/Contact/ContactEdition.qml index e550612c5..417f78824 100644 --- a/Linphone/view/Page/Form/Contact/ContactEdition.qml +++ b/Linphone/view/Page/Form/Contact/ContactEdition.qml @@ -7,6 +7,7 @@ import QtQuick.Layouts import Linphone import UtilsCpp import SettingsCpp +import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle MainRightPanel { id: mainItem diff --git a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml index c735e4a33..13fc80510 100644 --- a/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml +++ b/Linphone/view/Page/Form/Meeting/AddParticipantsForm.qml @@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control import Linphone import UtilsCpp import SettingsCpp +import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle FocusScope{ id: mainItem diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index 221cf9297..c1bd07733 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -239,6 +239,7 @@ AbstractWindow { anchors.horizontalCenter: parent.horizontalCenter clip: true function open() { + if (mainItem.isConference) return y = headerItem.height/2 autoCloseZrtpToast.restart() }