d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash with ScrollView

Browse source
This commit is contained in:
Nicolas Werner 2021-01-17 04:05:02 +01:00
parent 551515860e
commit 07e71e6eae
6 changed files with 78 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
resources/qml/MessageInput.qml
View file

@ -8,7 +8,7 @@ import im.nheko 1.0
Rectangle {
color: colors.window
Layout.fillWidth: true
Layout.preferredHeight: textInput.height
Layout.preferredHeight: textInput.height + 16
Layout.minimumHeight: 40
Component {
@ -23,6 +23,7 @@ Rectangle {
id: inputBar
anchors.fill: parent
anchors.margins: 8
spacing: 16
ImageButton {
@ -35,9 +36,7 @@ Rectangle {
image: CallManager.isOnCall ? ":/icons/icons/ui/end-call.png" : ":/icons/icons/ui/place-call.png"
ToolTip.visible: hovered
ToolTip.text: CallManager.isOnCall ? qsTr("Hang up") : qsTr("Place a call")
Layout.topMargin: 8
Layout.bottomMargin: 8
Layout.leftMargin: 16
Layout.leftMargin: 8
onClicked: {
if (TimelineManager.timeline) {
if (CallManager.haveCallInvite) {
@ -59,9 +58,7 @@ Rectangle {
width: 22
height: 22
image: ":/icons/icons/ui/paper-clip-outline.png"
Layout.topMargin: 8
Layout.bottomMargin: 8
Layout.leftMargin: CallManager.callsSupported ? 0 : 16
Layout.leftMargin: CallManager.callsSupported ? 0 : 8
onClicked: TimelineManager.timeline.input.openFileSelection()
ToolTip.visible: hovered
ToolTip.text: qsTr("Send a file")
@ -80,12 +77,30 @@ Rectangle {
}
ScrollView {
Flickable {
id: textInput
function ensureVisible(r) {
if (contentX >= r.x)
contentX = r.x;
else if (contentX + width <= r.x + r.width)
contentX = r.x + r.width - width;
if (contentY >= r.y)
contentY = r.y;
else if (contentY + height <= r.y + r.height)
contentY = r.y + r.height - height;
}
Layout.alignment: Qt.AlignBottom
Layout.maximumHeight: Window.height / 4
Layout.minimumHeight: Settings.fontSize
Layout.fillWidth: true
clip: true
boundsBehavior: Flickable.StopAtBounds
implicitWidth: textArea.width
implicitHeight: textArea.height
contentWidth: textArea.width
contentHeight: textArea.height
TextArea {
id: textArea
@ -104,13 +119,17 @@ Rectangle {
popup.completer.setSearchString(textArea.getText(completerTriggeredAt, cursorPosition));
}
text: "asfkajsdf"
selectByMouse: true
placeholderText: qsTr("Write a message...")
placeholderTextColor: colors.buttonText
color: colors.text
width: textInput.width
wrapMode: TextEdit.Wrap
padding: 0
focus: true
onTextChanged: TimelineManager.timeline.input.updateState(selectionStart, selectionEnd, cursorPosition, text)
onCursorRectangleChanged: textInput.ensureVisible(cursorRectangle)
onCursorPositionChanged: {
TimelineManager.timeline.input.updateState(selectionStart, selectionEnd, cursorPosition, text);
if (cursorPosition <= completerTriggeredAt) {
@ -189,6 +208,7 @@ Rectangle {
popup.down();
}
}
background: null
Connections {
onTimelineChanged: {
@ -230,10 +250,9 @@ Rectangle {
roomid: TimelineManager.timeline.roomId()
}
background: Rectangle {
color: colors.window
}
ScrollBar.vertical: ScrollBar {
}
}
@ -246,8 +265,6 @@ Rectangle {
width: 22
height: 22
image: ":/icons/icons/ui/smile.png"
Layout.topMargin: 8
Layout.bottomMargin: 8
ToolTip.visible: hovered
ToolTip.text: qsTr("Emoji")
onClicked: emojiPopup.visible ? emojiPopup.close() : emojiPopup.show(emojiButton, function(emoji) {
@ -261,9 +278,7 @@ Rectangle {
width: 22
height: 22
image: ":/icons/icons/ui/cursor.png"
Layout.topMargin: 8
Layout.bottomMargin: 8
Layout.rightMargin: 16
Layout.rightMargin: 8
ToolTip.visible: hovered
ToolTip.text: qsTr("Send")
onClicked: {

1
resources/qml/MessageView.qml
View file

@ -23,6 +23,7 @@ ListView {
// Mark timeline as read
if (atYEnd)
model.currentIndex = 0;
}
ScrollHelper {

2
resources/qml/TimelineView.qml
View file

@ -57,6 +57,7 @@ Page {
CallInvite {
}
}
Menu {
@ -202,6 +203,7 @@ Page {
Rectangle {
id: msgView
Layout.fillWidth: true
Layout.fillHeight: true
color: colors.base

2
resources/qml/ui/Ripple.qml
View file

@ -1,6 +1,6 @@
import QtGraphicalEffects 1.0
import QtQuick 2.10
import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
Item {
id: ripple

2
resources/qml/voip/CallDevices.qml
View file

@ -6,12 +6,12 @@ import im.nheko 1.0
Popup {
modal: true
palette: colors
// only set the anchors on Qt 5.12 or higher
// see https://doc.qt.io/qt-5/qml-qtquick-controls2-popup.html#anchors.centerIn-prop
Component.onCompleted: {
if (anchors)
anchors.centerIn = parent;
}
ColumnLayout {

63
resources/qml/voip/CallInvite.qml
View file

@ -9,23 +9,21 @@ Popup {
width: parent.width
height: parent.height
palette: colors
background: Rectangle {
color: colors.window
border.color: colors.windowText
}
Component {
id: deviceError
DeviceError {
}
}
Connections {
target: CallManager
onNewInviteState: {
if (!CallManager.haveCallInvite) {
if (!CallManager.haveCallInvite)
close();
}
}
}
@ -56,6 +54,7 @@ Popup {
Image {
property string image: CallManager.isVideo ? ":/icons/icons/ui/video-call.png" : ":/icons/icons/ui/place-call.png"
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: msgView.height / 10
Layout.preferredHeight: msgView.height / 10
@ -68,17 +67,18 @@ Popup {
font.pointSize: fontMetrics.font.pointSize * 2
color: colors.windowText
}
}
ColumnLayout {
id: deviceCombos
property int imageSize: msgView.height / 20
Layout.alignment: Qt.AlignCenter
Layout.bottomMargin: msgView.height / 25
RowLayout {
Layout.alignment: Qt.AlignCenter
Image {
@ -89,13 +89,14 @@ Popup {
ComboBox {
id: micCombo
Layout.fillWidth: true
model: CallManager.mics
}
}
RowLayout {
visible: CallManager.isVideo && CallManager.cameras.length > 0
Layout.alignment: Qt.AlignCenter
@ -107,18 +108,19 @@ Popup {
ComboBox {
id: cameraCombo
Layout.fillWidth: true
model: CallManager.cameras
}
}
}
RowLayout {
id: buttonLayout
property int buttonSize: msgView.height / 8
Layout.alignment: Qt.AlignCenter
spacing: msgView.height / 6
function validateMic() {
if (CallManager.mics.length == 0) {
@ -132,51 +134,64 @@ Popup {
return true;
}
Layout.alignment: Qt.AlignCenter
spacing: msgView.height / 6
RoundButton {
implicitWidth: buttonLayout.buttonSize
implicitHeight: buttonLayout.buttonSize
onClicked: {
CallManager.hangUp();
close();
}
background: Rectangle {
radius: buttonLayout.buttonSize / 2
color: "#ff0000"
}
contentItem : Image {
contentItem: Image {
source: "image://colorimage/:/icons/icons/ui/end-call.png?#ffffff"
}
onClicked: {
CallManager.hangUp();
close();
}
}
RoundButton {
id: acceptButton
property string image: CallManager.isVideo ? ":/icons/icons/ui/video-call.png" : ":/icons/icons/ui/place-call.png"
implicitWidth: buttonLayout.buttonSize
implicitHeight: buttonLayout.buttonSize
onClicked: {
if (buttonLayout.validateMic()) {
Settings.microphone = micCombo.currentText;
if (cameraCombo.visible)
Settings.camera = cameraCombo.currentText;
CallManager.acceptInvite();
close();
}
}
background: Rectangle {
radius: buttonLayout.buttonSize / 2
color: "#00ff00"
}
contentItem : Image {
contentItem: Image {
source: "image://colorimage/" + acceptButton.image + "?#ffffff"
}
onClicked: {
if (buttonLayout.validateMic()) {
Settings.microphone = micCombo.currentText;
if (cameraCombo.visible)
Settings.camera = cameraCombo.currentText;
CallManager.acceptInvite();
close();
}
}
}
}
background: Rectangle {
color: colors.window
border.color: colors.windowText
}
}