rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix emoji verification clipped on sway 

fixes #917
This commit is contained in:
Nicolas Werner 2022-07-03 03:39:01 +02:00
parent 678806749d
commit f387e3b033
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
7 changed files with 572 additions and 605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/qml/device-verification/DeviceVerification.qml
View File

@ -14,21 +14,29 @@ ApplicationWindow {
property var flow
onClosing: VerificationManager.removeVerificationFlow(flow)
title: stack.currentItem.title_
title: stack.currentItem ? (stack.currentItem.title_ || "") : ""
modality: Qt.NonModal
palette: Nheko.colors
color: Nheko.colors.window
minimumHeight: stack.implicitHeight
width: stack.implicitWidth
//height: stack.currentItem.implicitHeight
minimumHeight: stack.currentItem.implicitHeight + 2 * Nheko.paddingLarge
height: stack.currentItem.implicitHeight + 2 * Nheko.paddingMedium
minimumWidth: 400
flags: Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
background: Rectangle {
color: Nheko.colors.window
}
StackView {
id: stack
anchors.fill: parent
anchors.centerIn: parent
initialItem: newVerificationRequest
implicitWidth: currentItem.implicitWidth
implicitHeight: currentItem.implicitHeight
implicitWidth: dialog.width - 2* Nheko.paddingMedium
implicitHeight: dialog.height - 2* Nheko.paddingMedium
}
Component {
@ -86,7 +94,7 @@ ApplicationWindow {
name: "PromptStartVerification"
StateChangeScript {
script: stack.replace(newVerificationRequest)
script: stack.replace(null, newVerificationRequest)
}
},
@ -94,7 +102,7 @@ ApplicationWindow {
name: "CompareEmoji"
StateChangeScript {
script: stack.replace(emojiVerification)
script: stack.replace(null, emojiVerification)
}
},
@ -102,7 +110,7 @@ ApplicationWindow {
name: "CompareNumber"
StateChangeScript {
script: stack.replace(digitVerification)
script: stack.replace(null, digitVerification)
}
},
@ -110,7 +118,7 @@ ApplicationWindow {
name: "WaitingForKeys"
StateChangeScript {
script: stack.replace(waiting)
script: stack.replace(null, waiting)
}
},
@ -118,7 +126,7 @@ ApplicationWindow {
name: "WaitingForOtherToAccept"
StateChangeScript {
script: stack.replace(waiting)
script: stack.replace(null, waiting)
}
},
@ -126,7 +134,7 @@ ApplicationWindow {
name: "WaitingForMac"
StateChangeScript {
script: stack.replace(waiting)
script: stack.replace(null, waiting)
}
},
@ -134,7 +142,7 @@ ApplicationWindow {
name: "Success"
StateChangeScript {
script: stack.replace(success)
script: stack.replace(null, success)
}
},
@ -142,7 +150,7 @@ ApplicationWindow {
name: "Failed"
StateChangeScript {
script: stack.replace(failed)
script: stack.replace(null, failed)
}
}

11
resources/qml/device-verification/DigitVerification.qml
View File

@ -8,14 +8,9 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: qsTr("Verification Code")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: qsTr("Verification Code")
spacing: 16
Label {
@ -75,5 +70,3 @@ Pane {
}
}
}

11
resources/qml/device-verification/EmojiVerification.qml
View File

@ -8,14 +8,9 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: qsTr("Verification Code")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: qsTr("Verification Code")
spacing: 16
Label {
@ -420,5 +415,3 @@ Pane {
}
}
}

10
resources/qml/device-verification/Failed.qml
View File

@ -8,14 +8,8 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: qsTr("Verification failed")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: qsTr("Verification failed")
spacing: 16
Text {
@ -62,5 +56,3 @@ Pane {
}
}
}

11
resources/qml/device-verification/NewVerificationRequest.qml
View File

@ -8,14 +8,9 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: flow.sender ? qsTr("Send Verification Request") : qsTr("Received Verification Request")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: flow.sender ? qsTr("Send Verification Request") : qsTr("Received Verification Request")
spacing: 16
Label {
@ -71,5 +66,3 @@ Pane {
}
}
}

11
resources/qml/device-verification/Success.qml
View File

@ -8,14 +8,9 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: qsTr("Successful Verification")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: qsTr("Successful Verification")
spacing: 16
Label {
@ -45,5 +40,3 @@ Pane {
}
}
}

11
resources/qml/device-verification/Waiting.qml
View File

@ -9,14 +9,8 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.10
import im.nheko 1.0
Pane {
property string title: qsTr("Waiting for other party…")
background: Rectangle {
color: Nheko.colors.window
}
ColumnLayout {
anchors.fill: parent
property string title: qsTr("Waiting for other party…")
spacing: 16
Label {
@ -33,6 +27,8 @@ Pane {
return qsTr("Waiting for other side to continue the verification process.");
case "WaitingForMac":
return qsTr("Waiting for other side to complete the verification process.");
default:
return "";
}
}
color: Nheko.colors.text
@ -64,4 +60,3 @@ Pane {
}
}