From 4d7eb5795cda8c4187d674a474113ac7abb9b34d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 18 Feb 2016 00:32:46 +0000 Subject: [PATCH 1/5] tint border-left --- src/Tinter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tinter.js b/src/Tinter.js index b258930425..a83ccdce74 100644 --- a/src/Tinter.js +++ b/src/Tinter.js @@ -64,6 +64,7 @@ var cssAttrs = [ "borderColor", "borderTopColor", "borderBottomColor", + "borderLeftColor", ]; var svgAttrs = [ From 12f5407392701d5db71d4628e92eb2de0b7a40eb Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 18 Feb 2016 18:16:48 +0000 Subject: [PATCH 2/5] remove ... in error view --- src/components/structures/RoomStatusBar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js index a8f0de3e92..75cb06daf6 100644 --- a/src/components/structures/RoomStatusBar.js +++ b/src/components/structures/RoomStatusBar.js @@ -111,6 +111,10 @@ module.exports = React.createClass({ ); } + if (this.state.syncState === "ERROR") { + return null; + } + if (wantPlaceholder) { return (
...
From dc94df4b06fbc3f7cd661645a537614cf1844814 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 18 Feb 2016 19:09:58 +0000 Subject: [PATCH 3/5] accomodate 800px wide thumbs and support horizontal scaling --- src/components/views/messages/MImageBody.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 691380d678..b54a51c45b 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -94,7 +94,7 @@ module.exports = React.createClass({ _getThumbUrl: function() { var content = this.props.mxEvent.getContent(); - return MatrixClientPeg.get().mxcUrlToHttp(content.url, 480, 360); + return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600); }, render: function() { @@ -103,10 +103,10 @@ module.exports = React.createClass({ var cli = MatrixClientPeg.get(); var thumbHeight = null; - if (content.info) thumbHeight = this.thumbHeight(content.info.w, content.info.h, 480, 360); + if (content.info) thumbHeight = this.thumbHeight(content.info.w, content.info.h, 800, 600); var imgStyle = {}; - if (thumbHeight) imgStyle['height'] = thumbHeight; + if (thumbHeight) imgStyle['maxHeight'] = thumbHeight; var thumbUrl = this._getThumbUrl(); if (thumbUrl) { From 7f310ce3073f67c852edf0dfe072169e1ff116d2 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 19 Feb 2016 01:18:37 +0000 Subject: [PATCH 4/5] fix nasty overscroll bug on video element caused by inline v. block --- src/components/views/voip/CallView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js index ed44313b9e..5958c2b278 100644 --- a/src/components/views/voip/CallView.js +++ b/src/components/views/voip/CallView.js @@ -85,9 +85,9 @@ module.exports = React.createClass({ // if this call is a conf call, don't display local video as the // conference will have us in it this.getVideoView().getLocalVideoElement().style.display = ( - call.confUserId ? "none" : "initial" + call.confUserId ? "none" : "block" ); - this.getVideoView().getRemoteVideoElement().style.display = "initial"; + this.getVideoView().getRemoteVideoElement().style.display = "block"; } else { this.getVideoView().getLocalVideoElement().style.display = "none"; From d2a731e255d7450a8e5bb9f1b00314ea065e428f Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 19 Feb 2016 01:18:53 +0000 Subject: [PATCH 5/5] only resize the video element if not fullscreen --- src/components/structures/RoomView.js | 18 ++++++++++++++---- src/components/views/voip/VideoView.js | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 61e8710c0d..5ac8943b33 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -1368,9 +1368,14 @@ module.exports = React.createClass({ if (auxPanelMaxHeight < 50) auxPanelMaxHeight = 50; if (this.refs.callView) { - var video = this.refs.callView.getVideoView().getRemoteVideoElement(); - - video.style.maxHeight = auxPanelMaxHeight + "px"; + var fullscreenElement = + (document.fullscreenElement || + document.mozFullScreenElement || + document.webkitFullscreenElement); + if (!fullscreenElement) { + var video = this.refs.callView.getVideoView().getRemoteVideoElement(); + video.style.maxHeight = auxPanelMaxHeight + "px"; + } } // we need to do this for general auxPanels too @@ -1414,6 +1419,11 @@ module.exports = React.createClass({ }); }, + onCallViewResize: function() { + this.onChildResize(); + this.onResize(); + }, + onChildResize: function() { // When the video or the message composer resizes, the scroll panel // also changes size. Work around GeminiScrollBar fail by telling it @@ -1733,7 +1743,7 @@ module.exports = React.createClass({
{ fileDropTarget } + onResize={this.onCallViewResize} /> { conferenceCallNotification } { aux }
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js index 08e587f47f..6b4b546270 100644 --- a/src/components/views/voip/VideoView.js +++ b/src/components/views/voip/VideoView.js @@ -64,6 +64,7 @@ module.exports = React.createClass({ element.msRequestFullscreen ); requestMethod.call(element); + this.getRemoteVideoElement().style.maxHeight = "inherit"; } else { var exitMethod = (