diff --git a/resources/qml/voip/PlaceCall.qml b/resources/qml/voip/PlaceCall.qml
index 95383d95..65f2f350 100644
--- a/resources/qml/voip/PlaceCall.qml
+++ b/resources/qml/voip/PlaceCall.qml
@@ -5,19 +5,16 @@ import QtQuick.Layouts 1.2
import im.nheko 1.0
Popup {
-
modal: true
anchors.centerIn: parent
palette: colors
- background: Rectangle {
- color: colors.window
- border.color: colors.windowText
- }
Component {
id: deviceError
+
DeviceError {
}
+
}
ColumnLayout {
@@ -26,7 +23,6 @@ Popup {
spacing: 16
RowLayout {
-
Layout.topMargin: 8
Layout.leftMargin: 8
@@ -38,14 +34,12 @@ Popup {
Item {
Layout.fillWidth: true
}
+
}
RowLayout {
id: buttonLayout
- Layout.leftMargin: 8
- Layout.rightMargin: 8
-
function validateMic() {
if (CallManager.mics.length == 0) {
var dialog = deviceError.createObject(timelineRoot, {
@@ -58,6 +52,9 @@ Popup {
return true;
}
+ Layout.leftMargin: 8
+ Layout.rightMargin: 8
+
Avatar {
Layout.rightMargin: cameraCombo.visible ? 16 : 64
width: avatarSize
@@ -71,7 +68,7 @@ Popup {
icon.source: "qrc:/icons/icons/ui/place-call.png"
onClicked: {
if (buttonLayout.validateMic()) {
- Settings.microphone = micCombo.currentText
+ Settings.microphone = micCombo.currentText;
CallManager.sendInvite(TimelineManager.timeline.roomId(), false);
close();
}
@@ -84,8 +81,8 @@ Popup {
icon.source: "qrc:/icons/icons/ui/video-call.png"
onClicked: {
if (buttonLayout.validateMic()) {
- Settings.microphone = micCombo.currentText
- Settings.camera = cameraCombo.currentText
+ Settings.microphone = micCombo.currentText;
+ Settings.camera = cameraCombo.currentText;
CallManager.sendInvite(TimelineManager.timeline.roomId(), true);
close();
}
@@ -98,13 +95,13 @@ Popup {
close();
}
}
+
}
ColumnLayout {
spacing: 8
RowLayout {
-
Layout.leftMargin: 8
Layout.rightMargin: 8
Layout.bottomMargin: cameraCombo.visible ? 0 : 8
@@ -117,13 +114,14 @@ Popup {
ComboBox {
id: micCombo
+
Layout.fillWidth: true
model: CallManager.mics
}
+
}
RowLayout {
-
visible: CallManager.cameras.length > 0
Layout.leftMargin: 8
Layout.rightMargin: 8
@@ -137,10 +135,20 @@ Popup {
ComboBox {
id: cameraCombo
+
Layout.fillWidth: true
model: CallManager.cameras
}
+
}
+
}
+
}
+
+ background: Rectangle {
+ color: colors.window
+ border.color: colors.windowText
+ }
+
}
|