Merge pull request #6609 from SimonBrandner/feature/left-align-call-t…

…iles Left align call tiles
matrix-org · Aug 13, 2021 · 20ac54f · 20ac54f
2 parents ebc7d9e + c79852a
commit 20ac54f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/res/css/views/messages/_CallEvent.scss b/res/css/views/messages/_CallEvent.scss
@@ -16,7 +16,6 @@ limitations under the License.
 
 .mx_CallEvent_wrapper {
     display: flex;
-    justify-content: center;
     width: 100%;
 
     .mx_CallEvent {
@@ -28,7 +27,7 @@ limitations under the License.
 
         background-color: $dark-panel-bg-color;
         border-radius: 8px;
-        width: 75%;
+        width: 65%;
         box-sizing: border-box;
         height: 60px;
         margin: 4px 0;

diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
@@ -932,8 +932,11 @@ export default class EventTile extends React.Component<IProps, IState> {
         } else if (this.props.layout == Layout.IRC) {
             avatarSize = 14;
             needsSenderProfile = true;
-        } else if (this.props.continuation && this.props.tileShape !== TileShape.FileGrid) {
-            // no avatar or sender profile for continuation messages
+        } else if (
+            (this.props.continuation && this.props.tileShape !== TileShape.FileGrid) ||
+            this.props.mxEvent.getType() === EventType.CallInvite
+        ) {
+            // no avatar or sender profile for continuation messages and call tiles
             avatarSize = 0;
             needsSenderProfile = false;
         } else {

diff --git a/src/utils/EventUtils.ts b/src/utils/EventUtils.ts
@@ -116,14 +116,14 @@ export function getEventDisplayInfo(mxEvent: MatrixEvent): {
         (eventType === EventType.RoomMessage && msgtype && msgtype.startsWith("m.key.verification")) ||
         (eventType === EventType.RoomCreate) ||
         (eventType === EventType.RoomEncryption) ||
-        (eventType === EventType.CallInvite) ||
         (tileHandler === "messages.MJitsiWidgetEvent")
     );
     let isInfoMessage = (
         !isBubbleMessage &&
         eventType !== EventType.RoomMessage &&
         eventType !== EventType.Sticker &&
-        eventType !== EventType.RoomCreate
+        eventType !== EventType.RoomCreate &&
+        eventType !== EventType.CallInvite
     );
 
     // If we're showing hidden events in the timeline, we should use the