summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2022-02-25 17:24:00 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2022-02-25 17:24:00 +0100
commit2c5489468d31f187d79073d9dc18aa3e64cd0d7f (patch)
tree2afca32c2f17ef57d8bdbbaac7f2957cadc492c4
parentMerge branch 'v0.9.1-fixes' (diff)
downloadnheko-2c5489468d31f187d79073d9dc18aa3e64cd0d7f.tar.xz
Fix mobile call screen
See #469
-rw-r--r--resources/qml/Root.qml2
-rw-r--r--resources/qml/voip/CallInvite.qml24
2 files changed, 15 insertions, 11 deletions
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml

index f9da6b7b..33ffee3d 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml
@@ -294,7 +294,7 @@ Pane { Connections { function onNewInviteState() { if (CallManager.haveCallInvite && Settings.mobileMode) { - var dialog = mobileCallInviteDialog.createObject(msgView); + var dialog = mobileCallInviteDialog.createObject(timelineRoot); dialog.open(); destroyOnClose(dialog); } diff --git a/resources/qml/voip/CallInvite.qml b/resources/qml/voip/CallInvite.qml
index 3bf7c4cd..7bab3616 100644 --- a/resources/qml/voip/CallInvite.qml +++ b/resources/qml/voip/CallInvite.qml
@@ -10,6 +10,8 @@ import QtQuick.Layouts 1.2 import im.nheko 1.0 Popup { + id: callInv + closePolicy: Popup.NoAutoClose width: parent.width height: parent.height @@ -40,16 +42,18 @@ Popup { Label { Layout.alignment: Qt.AlignCenter - Layout.topMargin: msgView.height / 25 + Layout.topMargin: callInv.parent.height / 25 + Layout.fillWidth: true text: CallManager.callPartyDisplayName font.pointSize: fontMetrics.font.pointSize * 2 color: Nheko.colors.windowText + horizontalAlignment: Text.AlignHCenter } Avatar { Layout.alignment: Qt.AlignCenter - width: msgView.height / 5 - height: msgView.height / 5 + Layout.preferredHeight: callInv.height / 5 + Layout.preferredWidth: callInv.height / 5 url: CallManager.callPartyAvatarUrl.replace("mxc://", "image://MxcImage/") userid: CallManager.callParty displayName: CallManager.callPartyDisplayName @@ -57,14 +61,14 @@ Popup { ColumnLayout { Layout.alignment: Qt.AlignCenter - Layout.bottomMargin: msgView.height / 25 + Layout.bottomMargin: callInv.height / 25 Image { property string image: CallManager.callType == CallType.VIDEO ? ":/icons/icons/ui/video.svg" : ":/icons/icons/ui/place-call.svg" Layout.alignment: Qt.AlignCenter - Layout.preferredWidth: msgView.height / 10 - Layout.preferredHeight: msgView.height / 10 + Layout.preferredWidth: callInv.height / 10 + Layout.preferredHeight: callInv.height / 10 source: "image://colorimage/" + image + "?" + Nheko.colors.windowText } @@ -80,10 +84,10 @@ Popup { ColumnLayout { id: deviceCombos - property int imageSize: msgView.height / 20 + property int imageSize: callInv.height / 20 Layout.alignment: Qt.AlignCenter - Layout.bottomMargin: msgView.height / 25 + Layout.bottomMargin: callInv.height / 25 RowLayout { Layout.alignment: Qt.AlignCenter @@ -127,7 +131,7 @@ Popup { RowLayout { id: buttonLayout - property int buttonSize: msgView.height / 8 + property int buttonSize: callInv.height / 8 function validateMic() { if (CallManager.mics.length == 0) { @@ -143,7 +147,7 @@ Popup { } Layout.alignment: Qt.AlignCenter - spacing: msgView.height / 6 + spacing: callInv.height / 6 RoundButton { implicitWidth: buttonLayout.buttonSize