From 3823150acc97cab8ecbc5e6f14dae6d653dac6fb Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 15 Dec 2020 14:19:37 +0100
Subject: [PATCH] Let message composer respect layout choice

---
 src/components/structures/RoomView.tsx        |  2 ++
 src/components/views/rooms/MessageComposer.js | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 85606756560..8d6c4be34cc 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -1846,6 +1846,8 @@ export default class RoomView extends React.Component<IProps, IState> {
                     resizeNotifier={this.props.resizeNotifier}
                     replyToEvent={this.state.replyToEvent}
                     permalinkCreator={this.getPermalinkCreatorForRoom(this.state.room)}
+                    useIRCLayout={this.state.useIRCLayout}
+                    useBubbleLayout={this.state.useBubbleLayout}
                 />;
         }
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 4ddff8f4b0f..3f3f2804b86 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -479,8 +479,18 @@ export default class MessageComposer extends React.Component {
             );
         }
 
+        const msgComposerClassNames = classNames(
+            "mx_MessageComposer",
+            {
+                // "mx_IRCLayout": this.props.useIRCLayout,
+                // "mx_GroupLayout": !this.props.useIRCLayout && !this.props.useBubbleLayout,
+                "mx_GroupLayout": !this.props.useBubbleLayout,
+                "sc_BubbleLayout": this.props.useBubbleLayout,
+            },
+        );
+
         return (
-            <div className="mx_MessageComposer mx_GroupLayout">
+            <div className={msgComposerClassNames}>
                 <div className="mx_MessageComposer_wrapper">
                     <ReplyPreview permalinkCreator={this.props.permalinkCreator} />
                     <div className="mx_MessageComposer_row">