diff --git a/Linphone/view/Control/Button/ComboBox.qml b/Linphone/view/Control/Button/ComboBox.qml index c60a78dfd..e8f3033c1 100644 --- a/Linphone/view/Control/Button/ComboBox.qml +++ b/Linphone/view/Control/Button/ComboBox.qml @@ -71,7 +71,7 @@ Control.ComboBox { } contentItem: RowLayout { anchors.fill: parent - anchors.leftMargin: Math.round(10 * DefaultStyle.dp) + anchors.leftMargin: mainItem.leftMargin anchors.rightMargin: indicImage.width + Math.round(10 * DefaultStyle.dp) spacing: Math.round(5 * DefaultStyle.dp) EffectImage { diff --git a/Linphone/view/Page/Form/Meeting/MeetingForm.qml b/Linphone/view/Page/Form/Meeting/MeetingForm.qml index d3391bcce..bd4f19217 100644 --- a/Linphone/view/Page/Form/Meeting/MeetingForm.qml +++ b/Linphone/view/Page/Form/Meeting/MeetingForm.qml @@ -247,6 +247,7 @@ FocusScope { id: addParticipantsButton Layout.fillWidth: true Layout.preferredHeight: Math.round(30 * DefaultStyle.dp) + leftPadding: 0 background: Rectangle { anchors.fill: parent color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent" @@ -321,6 +322,7 @@ FocusScope { text: qsTr("meeting_schedule_send_invitations_title") checked: mainItem.conferenceInfoGui.core.inviteEnabled onToggled: mainItem.conferenceInfoGui.core.inviteEnabled = checked + leftPadding: 0 } Item { Layout.fillHeight: true diff --git a/Linphone/view/Page/Main/Call/WaitingRoom.qml b/Linphone/view/Page/Main/Call/WaitingRoom.qml index 3eb970398..684ac52d1 100644 --- a/Linphone/view/Page/Main/Call/WaitingRoom.qml +++ b/Linphone/view/Page/Main/Call/WaitingRoom.qml @@ -11,7 +11,7 @@ RowLayout { id: mainItem property alias localVideoEnabled: preview.videoEnabled property bool microEnabled: true - property bool settingsButtonChecked: settingsButton.checked + property alias settingsButtonChecked: settingsButton.checked property ConferenceInfoGui conferenceInfo signal joinConfRequested(string uri) signal cancelJoiningRequested() diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index ca0175e30..73130ebad 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -879,9 +879,9 @@ AbstractWindow { rightPanel.headerTitleText = qsTr("call_action_go_to_settings") } Keys.onEscapePressed: event => { - rightPanel.visible = false - event.accepted = true - } + rightPanel.visible = false + event.accepted = true + } MultimediaSettings { id: inSettingsPanel call: mainWindow.call @@ -1068,8 +1068,10 @@ AbstractWindow { Connections { target: rightPanel function onVisibleChanged() { - if (!visible) + if (!rightPanel.visible) { + console.log("unceck settings button") waitingRoomIn.settingsButtonChecked = false + } } } Connections {