From d31021c02d3a584a79c9701b0fa504deba29cd2d Mon Sep 17 00:00:00 2001 From: "DESKTOP-FMM8UI0\\CLV" Date: Mon, 19 Apr 2021 14:19:16 +0200 Subject: [PATCH 1/3] Replace share screen logo --- front/dist/resources/logos/monitor-close.svg | 45 +------------------- front/dist/resources/logos/monitor.svg | 29 ++++++++----- 2 files changed, 20 insertions(+), 54 deletions(-) diff --git a/front/dist/resources/logos/monitor-close.svg b/front/dist/resources/logos/monitor-close.svg index 80056e2d..52f446d1 100644 --- a/front/dist/resources/logos/monitor-close.svg +++ b/front/dist/resources/logos/monitor-close.svg @@ -1,44 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/front/dist/resources/logos/monitor.svg b/front/dist/resources/logos/monitor.svg index d4b586c6..be50195b 100644 --- a/front/dist/resources/logos/monitor.svg +++ b/front/dist/resources/logos/monitor.svg @@ -1,15 +1,24 @@ - - + + - + + + + + + + + + + + From b9d9a788684032dd171ba404ece76afaf617ddfa Mon Sep 17 00:00:00 2001 From: "DESKTOP-FMM8UI0\\CLV" Date: Mon, 19 Apr 2021 14:42:49 +0200 Subject: [PATCH 2/3] Link changed in Tutov3 Change position of cam and buttons share/cam/Mic --- front/dist/resources/style/style.css | 6 +++--- maps/Tuto/tutoV3.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css index ba5b6c07..68a59f78 100644 --- a/front/dist/resources/style/style.css +++ b/front/dist/resources/style/style.css @@ -136,7 +136,7 @@ body .message-info.warning{ #div-myCamVideo { position: absolute; right: 15px; - bottom: 15px; + bottom: 30px; border-radius: 15px 15px 15px 15px; } @@ -167,7 +167,7 @@ video#myCamVideo{ background: #666; box-shadow: 2px 2px 24px #444; border-radius: 48px; - transform: translateY(40px); + transform: translateY(20px); transition-timing-function: ease-in-out; bottom: 20px; } @@ -183,7 +183,7 @@ video#myCamVideo{ .btn-cam-action div:hover{ background: #407cf7; box-shadow: 4px 4px 48px #666; - transition: 280ms; + transition: 120ms; } .btn-micro{ transition: all .3s; diff --git a/maps/Tuto/tutoV3.json b/maps/Tuto/tutoV3.json index 0362ae1c..2ae43690 100644 --- a/maps/Tuto/tutoV3.json +++ b/maps/Tuto/tutoV3.json @@ -24,7 +24,7 @@ { "name":"exitUrl", "type":"string", - "value":"@\/tcm\/workadventure\/floor0" + "value":"\/@\/tcm\/workadventure\/floor0" }], "type":"tilelayer", "visible":true, @@ -355,7 +355,7 @@ "value":"scriptTuto.js" }], "renderorder":"right-down", - "tiledversion":"2021.03.23", + "tiledversion":"1.5.0", "tileheight":32, "tilesets":[ { From 7e6a8b477d434d4cb271f49d32261366df3967c0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-FMM8UI0\\CLV" Date: Mon, 19 Apr 2021 15:16:56 +0200 Subject: [PATCH 3/3] Debug state of share Screen button --- front/src/WebRtc/MediaManager.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts index 9da4aa59..0c414a3f 100644 --- a/front/src/WebRtc/MediaManager.ts +++ b/front/src/WebRtc/MediaManager.ts @@ -309,12 +309,17 @@ export class MediaManager { } private enableScreenSharing() { - this.monitorClose.style.display = "none"; - this.monitor.style.display = "block"; - this.monitorBtn.classList.add("enabled"); this.getScreenMedia().then((stream) => { this.triggerStartedScreenSharingCallbacks(stream); + this.monitorClose.style.display = "none"; + this.monitor.style.display = "block"; + this.monitorBtn.classList.add("enabled"); + }, () => { + this.monitorClose.style.display = "block"; + this.monitor.style.display = "none"; + this.monitorBtn.classList.remove("enabled"); }); + } private disableScreenSharing() {