From e3558f5bbd69fdebe10d1845ffe4af1724fe0227 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sat, 1 May 2021 17:29:31 +0300 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20/shrug=20=C2=AF\=5F(=E3=83=84)=5F/?= =?UTF-8?q?=C2=AF=20was=20escaped=20multiple=20times?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/actionshandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp index 51400e730..fd5d0e404 100644 --- a/src/actionshandler.cpp +++ b/src/actionshandler.cpp @@ -199,7 +199,7 @@ void ActionsHandler::postMessage(const QString &text, "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"}; if (cleanedText.indexOf(shrugPrefix) == 0) { - cleanedText = QStringLiteral("¯\\\\_(ツ)\\_/¯") % cleanedText.remove(0, shrugPrefix.length()); + cleanedText = QStringLiteral("¯\\_(ツ)_/¯") % cleanedText.remove(0, shrugPrefix.length()); m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId); return; } From 32c21b7b8452c7682d01320eb118d1c2ca9707ae Mon Sep 17 00:00:00 2001 From: Noah Davis Date: Sun, 2 May 2021 07:33:20 -0400 Subject: [PATCH 2/6] Fix Kirigami spelling mistake Kirigani -> Kirigami --- imports/NeoChat/Component/Timeline/TextDelegate.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/NeoChat/Component/Timeline/TextDelegate.qml b/imports/NeoChat/Component/Timeline/TextDelegate.qml index 2483695e2..5b69c6238 100644 --- a/imports/NeoChat/Component/Timeline/TextDelegate.qml +++ b/imports/NeoChat/Component/Timeline/TextDelegate.qml @@ -39,7 +39,7 @@ a{ } .user-pill{} -" + (isEmote ? "* " + author.displayName + " " : "") + model.display + (isEdited ? (" " + "" + i18n(" (edited)") + "") : "") +" + (isEmote ? "* " + author.displayName + " " : "") + model.display + (isEdited ? (" " + "" + i18n(" (edited)") + "") : "") color: Kirigami.Theme.textColor font.pointSize: !replyVisible && isEmoji.test(model.display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize From 75dc3e661100ae30b5fb3df62590a754cc2ff8d2 Mon Sep 17 00:00:00 2001 From: Srevin Saju Date: Sun, 2 May 2021 10:43:19 +0300 Subject: [PATCH 3/6] fix: do not show scroll bar on x-axis in the auto completion bar Fixes #342 --- imports/NeoChat/Component/ChatBox/CompletionMenu.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml index 39367d363..be7f00b07 100644 --- a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml +++ b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml @@ -45,6 +45,7 @@ Popup { implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 5) contentItem: ScrollView { + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff ListView { id: completionListView implicitWidth: contentWidth From ccb12e1bed4c1937bedff5af81abca6847d7cb8b Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Sun, 2 May 2021 15:41:06 +0000 Subject: [PATCH 4/6] Update urls --- org.kde.neochat.appdata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.kde.neochat.appdata.xml b/org.kde.neochat.appdata.xml index f62479fad..7924d07c7 100644 --- a/org.kde.neochat.appdata.xml +++ b/org.kde.neochat.appdata.xml @@ -79,8 +79,8 @@

Клієнт matrix, децентралізованого протоколу обміну даними.

xxA client for matrix, the decentralized communication protocol.xx

- https://kde.org - https://bugs.kde.org + https://apps.kde.org/neochat/ + https://invent.kde.org/network/neochat/-/issues Network From 472490f25754dc1caaaf045f4b9d6e70d49ce6b2 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 5 May 2021 16:56:05 +0200 Subject: [PATCH 5/6] Possible fix the freeze found in NeoChat I looked at Tok code and found this as architectural difference in their ListView. --- imports/NeoChat/Component/Timeline/TimelineContainer.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml index d721a49d0..b883d8e25 100644 --- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml +++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml @@ -13,6 +13,7 @@ import NeoChat.Component 1.0 import NeoChat.Dialog 1.0 QQC2.ItemDelegate { + id: messageDelegate default property alias innerObject : column.children readonly property bool sentByMe: author.isLocalUser readonly property bool darkBackground: !sentByMe @@ -71,6 +72,7 @@ QQC2.ItemDelegate { Layout.rightMargin: Kirigami.Units.smallSpacing Layout.bottomMargin: 0 Layout.topMargin: model.showAuthor ? Kirigami.Units.smallSpacing : 0 + Layout.fillWidth: true Kirigami.Avatar { Layout.minimumWidth: Kirigami.Units.gridUnit * 2 @@ -104,15 +106,15 @@ QQC2.ItemDelegate { visible: !model.showAuthor && Config.showAvatarInTimeline } - QQC2.ItemDelegate { + QQC2.Control { id: bubble - Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2 implicitHeight: contentItem.implicitHeight + topPadding topPadding: Kirigami.Units.largeSpacing bottomPadding: 0 leftPadding: 0 rightPadding: 0 hoverEnabled: true + Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2 contentItem: ColumnLayout { id: column @@ -173,6 +175,9 @@ QQC2.ItemDelegate { border.width: Kirigami.Units.devicePixelRatio } } + Item { + Layout.fillWidth: true + } } Loader { id: loader From ea403eb679e21f90350941ecc4aa46cb7e86bf64 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 5 May 2021 17:11:00 +0000 Subject: [PATCH 6/6] Fix freze in neochat chat view --- imports/NeoChat/Page/RoomPage.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml index 2a1a5cb08..aa2a7efd9 100644 --- a/imports/NeoChat/Page/RoomPage.qml +++ b/imports/NeoChat/Page/RoomPage.qml @@ -377,6 +377,7 @@ Kirigami.ScrollablePage { DelegateChoice { roleValue: "emote" delegate: TimelineContainer { + id: emoteContainer width: messageListView.width isLoaded: timelineDelegateChooser.delegateLoaded isEmote: true @@ -387,8 +388,8 @@ Kirigami.ScrollablePage { innerObject: TextDelegate { isEmote: true Layout.fillWidth: true - - Layout.rightMargin: Kirigami.Units.largeSpacing + Layout.maximumWidth: emoteContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 + Layout.rightMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 TapHandler { @@ -406,6 +407,7 @@ Kirigami.ScrollablePage { DelegateChoice { roleValue: "message" delegate: TimelineContainer { + id: messageContainer width: messageListView.width isLoaded: timelineDelegateChooser.delegateLoaded onReplyClicked: goToEvent(eventID) @@ -414,6 +416,7 @@ Kirigami.ScrollablePage { innerObject: TextDelegate { Layout.fillWidth: true + Layout.maximumWidth: messageContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 Layout.rightMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Kirigami.Units.largeSpacing @@ -432,6 +435,7 @@ Kirigami.ScrollablePage { DelegateChoice { roleValue: "notice" delegate: TimelineContainer { + id: noticeContainer width: messageListView.width isLoaded: timelineDelegateChooser.delegateLoaded onReplyClicked: goToEvent(eventID) @@ -439,6 +443,7 @@ Kirigami.ScrollablePage { hoverComponent: hoverActions innerObject: TextDelegate { Layout.fillWidth: true + Layout.maximumWidth: noticeContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 Layout.rightMargin: Kirigami.Units.largeSpacing Layout.leftMargin: Kirigami.Units.largeSpacing Layout.bottomMargin: Kirigami.Units.largeSpacing * 2