mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 12:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

reduce size of auxpanel when editing roomsettings

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-20 23:09:36 +00:00
parent 6f6db75ea1
commit 35c141cda9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/structures/RoomView.js
View file

@ -1190,7 +1190,7 @@ module.exports = React.createClass({
},
onSettingsClick: function() {
this.setState({editingRoomSettings: true});
this.showSettings(true);
},
onSaveClick: function() {
@ -1369,7 +1369,7 @@ module.exports = React.createClass({
(83 + // height of RoomHeader
36 + // height of the status area
72 + // minimum height of the message compmoser
120); // amount of desired scrollback
(this.state.editingRoomSettings ? (window.innerHeight * 0.3) : 120)); // amount of desired scrollback
// XXX: this is a bit of a hack and might possibly cause the video to push out the page anyway
// but it's better than the video going missing entirely
@ -1379,16 +1379,16 @@ module.exports = React.createClass({
var video = this.refs.callView.getVideoView().getRemoteVideoElement();
video.style.maxHeight = auxPanelMaxHeight + "px";
// the above might have made the video panel resize itself, so now
// we need to tell the gemini panel to adapt.
this.onChildResize();
}
// we need to do this for general auxPanels too
if (this.refs.auxPanel) {
this.refs.auxPanel.style.maxHeight = auxPanelMaxHeight + "px";
}
// the above might have made the aux panel resize itself, so now
// we need to tell the gemini panel to adapt.
this.onChildResize();
},
onFullscreenClick: function() {
@ -1435,6 +1435,8 @@ module.exports = React.createClass({
// XXX: this is a bit naughty; we should be doing this via props
if (show) {
this.setState({editingRoomSettings: true});
var self = this;
setTimeout(function() { self.onResize() }, 0);
}
},
@ -1726,7 +1728,6 @@ module.exports = React.createClass({
</div>
}
// if we have search results, we keep the messagepanel (so that it preserves its
// scroll state), but hide it.
var searchResultsPanel;