mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Move the 'thumbnail' video to the top-left of the screen

Browse source 
This was originally laid out at the MatrixChat level which could then be
CSSified, but Matthew suggests this looks a lot better being at the
RoomList level above recents. Move the rendering logic to RoomList.
This commit is contained in:
Kegan Dougal 2015-09-17 11:37:56 +01:00
parent 9c8b540d14
commit 7a50166dc6
4 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
skins/base/views/pages/MatrixChat.js
View file

@ -18,7 +18,6 @@ limitations under the License.
var React = require('react');
var ComponentBroker = require('../../../../src/ComponentBroker');
var CallHandler = require('../../../../src/CallHandler');
var LeftPanel = ComponentBroker.get('organisms/LeftPanel');
var RoomView = ComponentBroker.get('organisms/RoomView');
@ -30,7 +29,6 @@ var CreateRoom = ComponentBroker.get('organisms/CreateRoom');
var RoomDirectory = ComponentBroker.get('organisms/RoomDirectory');
var MatrixToolbar = ComponentBroker.get('molecules/MatrixToolbar');
var Notifier = ComponentBroker.get('organisms/Notifier');
var CallView = ComponentBroker.get('molecules/voip/CallView');
var MatrixChatController = require('../../../../src/controllers/pages/MatrixChat');
@ -55,7 +53,7 @@ module.exports = React.createClass({
render: function() {
if (this.state.logged_in && this.state.ready) {
var page_element, call_element;
var page_element;
var right_panel = "";
switch (this.state.page_type) {
@ -76,18 +74,6 @@ module.exports = React.createClass({
right_panel = <RightPanel/>
break;
}
// if we aren't viewing a room with an ongoing call, but there is an
// active call, show the call element - we need to do this to make
// audio/video not crap out
if (this.state.active_call && (
!this.state.currentRoom ||
!CallHandler.getCallForRoom(this.state.currentRoom))) {
console.log(
"Creating global CallView for active call in room %s",
this.state.active_call.roomId
);
call_element = <CallView className="mx_MatrixChat_callView"/>
}
// TODO: Fix duplication here and do conditionals like we do above
if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
@ -96,7 +82,6 @@ module.exports = React.createClass({
<MatrixToolbar />
<div className="mx_MatrixChat mx_MatrixChat_toolbarShowing">
<LeftPanel selectedRoom={this.state.currentRoom} />
{call_element}
<main className="mx_MatrixChat_middlePanel">
{page_element}
</main>
@ -109,7 +94,6 @@ module.exports = React.createClass({
return (
<div className="mx_MatrixChat">
<LeftPanel selectedRoom={this.state.currentRoom} />
{call_element}
<main className="mx_MatrixChat_middlePanel">
{page_element}
</main>