From 80355e6b85c331c1197546c94b33d101d58d1384 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Tue, 27 Oct 2020 20:46:53 +0100
Subject: [PATCH] fix layout mode click when discussion is activated

---
 front/dist/resources/style/style.css  | 3 +++
 front/src/Phaser/Game/GameScene.ts    | 4 ++++
 front/src/WebRtc/DiscussionManager.ts | 3 +++
 front/src/WebRtc/MediaManager.ts      | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css
index 6eb6f2b5..a01b1723 100644
--- a/front/dist/resources/style/style.css
+++ b/front/dist/resources/style/style.css
@@ -379,6 +379,7 @@ body {
     justify-content: center;
     flex-direction: column;
     overflow: hidden;
+    border-radius: 15px;
 }
 
 .chat-mode {
@@ -622,6 +623,7 @@ div.modal-report-user{
     left: calc(50% - 400px);
     top: 100px;
     background-color: #000000ad;
+    border-radius: 15px;
 }
 
 .modal-report-user textarea{
@@ -633,6 +635,7 @@ div.modal-report-user{
     color: white;
     width: calc(100% - 60px);
     margin: 30px;
+    border-radius: 15px;
 }
 
 .modal-report-user img{
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index bfc6402e..39b40c74 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -643,6 +643,10 @@ export class GameScene extends ResizableScene implements CenterListener {
     }
 
     private switchLayoutMode(): void {
+        //if discussion is activated, this layout cannot be activated
+        if(mediaManager.activatedDiscussion){
+            return;
+        }
         const mode = layoutManager.getLayoutMode();
         if (mode === LayoutMode.Presentation) {
             layoutManager.switchLayoutMode(LayoutMode.VideoChat);
diff --git a/front/src/WebRtc/DiscussionManager.ts b/front/src/WebRtc/DiscussionManager.ts
index a65ede25..cd063996 100644
--- a/front/src/WebRtc/DiscussionManager.ts
+++ b/front/src/WebRtc/DiscussionManager.ts
@@ -173,4 +173,7 @@ export class DiscussionManager {
         this.sendMessageCallBack.set(userId, callback);
     }
 
+    get activatedDiscussion(){
+        return this.activeDiscussion;
+    }
 }
\ No newline at end of file
diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts
index 9ad2438d..9ce449c0 100644
--- a/front/src/WebRtc/MediaManager.ts
+++ b/front/src/WebRtc/MediaManager.ts
@@ -582,6 +582,10 @@ export class MediaManager {
     public addSendMessageCallback(userId: string|number, callback: SendMessageCallback){
         this.discussionManager.onSendMessageCallback(userId, callback)
     }
+
+    get activatedDiscussion(){
+        return this.discussionManager.activatedDiscussion;
+    }
 }
 
 export const mediaManager = new MediaManager();