imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temp solution to make room settings usable

Browse source 
make mx_fadable not do anything anymore, and make room settings
full size.

Room settings haven't been designed yet, so all of this will
have a full pass when we have a go at it.
This commit is contained in:
Bruno Windels 2018-11-26 17:58:51 +01:00
parent 231d8fff6e
commit 887defda9c
6 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/rooms/AuxPanel.js
View file

@ -23,6 +23,7 @@ import dis from "../../../dispatcher";
import ObjectUtils from '../../../ObjectUtils';
import AppsDrawer from './AppsDrawer';
import { _t } from '../../../languageHandler';
import classNames from 'classnames';
module.exports = React.createClass({
@ -51,6 +52,7 @@ module.exports = React.createClass({
// a callback which is called when the content of the aux panel changes
// content in a way that is likely to make it change size.
onResize: PropTypes.func,
fullHeight: PropTypes.bool,
},
defaultProps: {
@ -143,8 +145,17 @@ module.exports = React.createClass({
hide={this.props.hideAppsDrawer}
/>;
const classes = classNames({
"mx_RoomView_auxPanel": true,
"mx_RoomView_auxPanel_fullHeight": this.props.fullHeight,
});
const style = {};
if (!this.props.fullHeight) {
style.maxHeight = this.props.maxHeight;
}
return (
<div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
<div className={classes} style={style} >
{ appsDrawer }
{ fileDropTarget }
{ callView }