diff --git a/matrix-react-sdk b/matrix-react-sdk index d160a1b..b3273f2 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d160a1bbdef8a93a2139e0e159a5fc5eb7c8ed7a +Subproject commit b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 diff --git a/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch similarity index 94% rename from patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch rename to patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch index e5aad3a..136ece8 100644 --- a/patches/matrix-react-sdk/0016-Import-SC-compound-theme-overrides.patch +++ b/patches/matrix-react-sdk/0015-Import-SC-compound-theme-overrides.patch @@ -1,4 +1,4 @@ -From 8b2c552f798e64974d0a0380f55cadb4f72dd67c Mon Sep 17 00:00:00 2001 +From 553d957b6d9ef9dd4d730c640a75bbb75fd36f88 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sun, 13 Oct 2024 11:23:54 +0200 Subject: Import SC compound theme overrides diff --git a/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch new file mode 100644 index 0000000..260eaec --- /dev/null +++ b/patches/matrix-react-sdk/0016-No-damn-avatar-background-in-room-list.patch @@ -0,0 +1,26 @@ +From d37ff20103b5a650f626ba9910e9ce1f6f7d59b9 Mon Sep 17 00:00:00 2001 +From: su-ex +Date: Tue, 7 Sep 2021 19:41:52 +0200 +Subject: No damn avatar background in room list + +--- + src/components/structures/BackdropPanel.tsx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx +index 80c21235cc..a9c464f4b2 100644 +--- a/src/components/structures/BackdropPanel.tsx ++++ b/src/components/structures/BackdropPanel.tsx +@@ -13,6 +13,9 @@ interface IProps { + } + + export const BackdropPanel: React.FC = ({ backgroundImage, blurMultiplier }) => { ++ // SC: no damn avatar background in room list ++ return null; ++ + if (!backgroundImage) return null; + + const styles: CSSProperties = {}; +-- +2.47.0 + diff --git a/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch b/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch new file mode 100644 index 0000000..85c8dc9 --- /dev/null +++ b/patches/matrix-react-sdk/0018-No-red-messages-in-1-1-chats.patch @@ -0,0 +1,30 @@ +From b3273f2ce4d14924f2710f0ac94cbee54aeee9c6 Mon Sep 17 00:00:00 2001 +From: su-ex +Date: Tue, 22 Dec 2020 19:16:28 +0100 +Subject: =?UTF-8?q?No=20red=20messages=20in=201:1=20chats=0AClose=20Schild?= + =?UTF-8?q?iChat/schildichat-desktop#13?= + +--- + src/components/views/rooms/EventTile.tsx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx +index 746cceabd8..3e5879f7ad 100644 +--- a/src/components/views/rooms/EventTile.tsx ++++ b/src/components/views/rooms/EventTile.tsx +@@ -685,6 +685,12 @@ export class UnwrappedEventTile extends React.Component + return false; + } + ++ // don't show highlights in 1:1 rooms ++ const room = cli.getRoom(this.props.mxEvent.getRoomId()); ++ if (room && room.currentState.getJoinedMemberCount() === 2) { ++ return false; ++ } ++ + return !!(actions?.tweaks.highlight || previousActions?.tweaks.highlight); + } + +-- +2.47.0 +