data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #LINQT-1912 meeting form left padding

Browse source 
fix #LINQT-1921 settings button in waiting room
This commit is contained in:
Gaelle Braud 2025-08-27 10:48:45 +02:00
parent 11f3546ba6
commit e55779d257
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/view/Control/Button/ComboBox.qml
View file

@ -71,7 +71,7 @@ Control.ComboBox {
} }
contentItem: RowLayout { contentItem: RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: Math.round(10 * DefaultStyle.dp) anchors.leftMargin: mainItem.leftMargin
anchors.rightMargin: indicImage.width + Math.round(10 * DefaultStyle.dp) anchors.rightMargin: indicImage.width + Math.round(10 * DefaultStyle.dp)
spacing: Math.round(5 * DefaultStyle.dp) spacing: Math.round(5 * DefaultStyle.dp)
EffectImage { EffectImage {

2
Linphone/view/Page/Form/Meeting/MeetingForm.qml
View file

@ -247,6 +247,7 @@ FocusScope {
id: addParticipantsButton id: addParticipantsButton
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: Math.round(30 * DefaultStyle.dp) Layout.preferredHeight: Math.round(30 * DefaultStyle.dp)
leftPadding: 0
background: Rectangle { background: Rectangle {
anchors.fill: parent anchors.fill: parent
color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent" color: addParticipantsButton.hovered || addParticipantsButton.activeFocus ? DefaultStyle.grey_100 : "transparent"
@ -321,6 +322,7 @@ FocusScope {
text: qsTr("meeting_schedule_send_invitations_title") text: qsTr("meeting_schedule_send_invitations_title")
checked: mainItem.conferenceInfoGui.core.inviteEnabled checked: mainItem.conferenceInfoGui.core.inviteEnabled
onToggled: mainItem.conferenceInfoGui.core.inviteEnabled = checked onToggled: mainItem.conferenceInfoGui.core.inviteEnabled = checked
leftPadding: 0
} }
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true

2
Linphone/view/Page/Main/Call/WaitingRoom.qml
View file

@ -11,7 +11,7 @@ RowLayout {
id: mainItem id: mainItem
property alias localVideoEnabled: preview.videoEnabled property alias localVideoEnabled: preview.videoEnabled
property bool microEnabled: true property bool microEnabled: true
property bool settingsButtonChecked: settingsButton.checked property alias settingsButtonChecked: settingsButton.checked
property ConferenceInfoGui conferenceInfo property ConferenceInfoGui conferenceInfo
signal joinConfRequested(string uri) signal joinConfRequested(string uri)
signal cancelJoiningRequested() signal cancelJoiningRequested()

10
Linphone/view/Page/Window/Call/CallsWindow.qml
View file

@ -879,9 +879,9 @@ AbstractWindow {
rightPanel.headerTitleText = qsTr("call_action_go_to_settings") rightPanel.headerTitleText = qsTr("call_action_go_to_settings")
} }
Keys.onEscapePressed: event => { Keys.onEscapePressed: event => {
rightPanel.visible = false rightPanel.visible = false
event.accepted = true event.accepted = true
} }
MultimediaSettings { MultimediaSettings {
id: inSettingsPanel id: inSettingsPanel
call: mainWindow.call call: mainWindow.call
@ -1068,8 +1068,10 @@ AbstractWindow {
Connections { Connections {
target: rightPanel target: rightPanel
function onVisibleChanged() { function onVisibleChanged() {
if (!visible) if (!rightPanel.visible) {
console.log("unceck settings button")
waitingRoomIn.settingsButtonChecked = false waitingRoomIn.settingsButtonChecked = false
}
} }
} }
Connections { Connections {