Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix domain notifications.

Browse source
This commit is contained in:
armored-dragon 2024-12-18 05:04:23 -06:00
parent 907e977508
commit 00451ca1f7
No known key found for this signature in database
GPG key ID: C7207ACC3382AD8B
1 changed files with 18 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
scripts/system/domainChat/domainChat.qml
View file

@ -167,11 +167,8 @@ Rectangle {
property string delegateDate: model.date property string delegateDate: model.date
sourceComponent: { sourceComponent: {
if (model.type === "chat") { if (model.type === "chat") return template_chat_message;
return template_chat_message; if (model.type === "notification") return template_notification;
} else if (model.type === "notification") {
return template_notification;
}
} }
} }
@ -384,9 +381,7 @@ Rectangle {
Rectangle { Rectangle {
property int index: delegateIndex property int index: delegateIndex
property var texttest: delegateText
property string username: delegateUsername property string username: delegateUsername
property string date: delegateDate
height: Math.max(65, children[1].height + 30) height: Math.max(65, children[1].height + 30)
color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1) color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1)
@ -405,7 +400,7 @@ Rectangle {
Text{ Text{
anchors.right: parent.right anchors.right: parent.right
text: date text: delegateDate
color: "lightgray" color: "lightgray"
} }
} }
@ -417,24 +412,14 @@ Rectangle {
id: messageBoxFlow id: messageBoxFlow
Repeater { Repeater {
model: texttest; model: delegateText;
RowLayout { RowLayout {
width: {
switch (model.type) {
case "text":
return children[0].width;
case "url":
return children[1].width;
}
}
Text { Text {
text: model.value || "" text: model.value || ""
font.pointSize: 12 font.pointSize: 12
wrapMode: Text.Wrap wrapMode: Text.Wrap
width: Math.min(messageBoxFlow.width, contentWidth); width: model.type === 'text' || model.type === 'mention' ? Math.min(messageBoxFlow.width, contentWidth) : 0;
visible: model.type === 'text' || model.type === 'mention'; visible: model.type === 'text' || model.type === 'mention';
color: { color: {
@ -448,7 +433,7 @@ Rectangle {
} }
RowLayout { RowLayout {
width: Math.min(messageBoxFlow.width, children[0].contentWidth); width: children[0].contentWidth;
visible: model.type === 'url'; visible: model.type === 'url';
Text { Text {
@ -524,11 +509,9 @@ Rectangle {
Window.openUrl(model.value); Window.openUrl(model.value);
} }
} }
} }
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
visible: model.type === 'messageEnd' visible: model.type === 'messageEnd'
@ -554,11 +537,10 @@ Rectangle {
Component { Component {
id: template_notification id: template_notification
Rectangle{ Rectangle {
property int index: delegateIndex property int index: delegateIndex
property var texttest: delegateText
property string username: delegateUsername property string username: delegateUsername
property string date: delegateDate
color: "#171717" color: "#171717"
width: parent.width width: parent.width
height: 40 height: 40
@ -574,15 +556,14 @@ Rectangle {
} }
} }
Item { Item {
width: parent.width - parent.children[0].width - 5 width: parent.width - parent.children[0].width - 5
height: parent.height height: parent.height
anchors.left: parent.children[0].right anchors.left: parent.children[0].right
TextEdit{ TextEdit {
text: texttest text: delegateText
color:"white" color: "white"
font.pointSize: 12 font.pointSize: 12
readOnly: true readOnly: true
width: parent.width * 0.8 width: parent.width * 0.8
@ -595,8 +576,8 @@ Rectangle {
} }
Text { Text {
text: date text: delegateDate
color:"white" color: "white"
font.pointSize: 12 font.pointSize: 12
anchors.right: parent.right anchors.right: parent.right
height: parent.height height: parent.height
@ -617,16 +598,16 @@ Rectangle {
} }
function scrollToBottom(bypassDistanceCheck = false, extraMoveDistance = 0) { function scrollToBottom(bypassDistanceCheck = false, extraMoveDistance = 0) {
const totalHeight = listview.height; // Total height of the content const totalHeight = listview.height; // Total height of the content
const currentPosition = messageViewFlickable.contentY; // Current position of the view const currentPosition = messageViewFlickable.contentY; // Current position of the view
const windowHeight = listview.parent.parent.height; // Total height of the window const windowHeight = listview.parent.parent.height; // Total height of the window
const bottomPosition = currentPosition + windowHeight; const bottomPosition = currentPosition + windowHeight;
// Check if the view is within 300 units from the bottom // Check if the view is within 300 units from the bottom
const closeEnoughToBottom = totalHeight - bottomPosition <= 300; const closeEnoughToBottom = totalHeight - bottomPosition <= 300;
if (!bypassDistanceCheck && !closeEnoughToBottom) return; if (!bypassDistanceCheck && !closeEnoughToBottom) return;
if (totalHeight < windowHeight) return; // No reason to scroll, we don't have an overflow. if (totalHeight < windowHeight) return; // No reason to scroll, we don't have an overflow.
if (bottomPosition == totalHeight) return; // At the bottom, do nothing. if (bottomPosition == totalHeight) return; // At the bottom, do nothing.
messageViewFlickable.contentY = listview.height - listview.parent.parent.height; messageViewFlickable.contentY = listview.height - listview.parent.parent.height;
messageViewFlickable.returnToBounds(); messageViewFlickable.returnToBounds();
@ -640,32 +621,11 @@ Rectangle {
if (type === "notification"){ if (type === "notification"){
channel.append({ text: message, date: date, type: "notification" }); channel.append({ text: message, date: date, type: "notification" });
last_message_user = "";
scrollToBottom(null, 30); scrollToBottom(null, 30);
last_message_time = new Date();
return; return;
} }
// TODO: Replace new time generation with time pregenerated from message
// var current_time = new Date();
// var elapsed_time = current_time - last_message_time;
// var elapsed_minutes = elapsed_time / (1000 * 60);
// var last_item_index = channel.count - 1;
// var last_item = channel.get(last_item_index);
// if (last_message_user === username && elapsed_minutes < 1 && last_item){
// message = "<br>" + message
// last_item.text = last_item.text += "\n" + message;
// load_scroll_timer.running = true;
// last_message_time = new Date();
// return;
// }
// last_message_user = username;
// last_message_time = new Date();
channel.append({ text: message, username: username, date: date, type: type }); channel.append({ text: message, username: username, date: date, type: type });
load_scroll_timer.running = true; load_scroll_timer.running = true;
} }