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

ForceUpdate the scrollpanel when the aux panel changes size

Browse source 
Catch some more cases when we ought to be updating the gemini scroll stuff.
This commit is contained in:
Richard van der Hoff 2016-03-08 12:16:34 +00:00
parent 393e8ff612
commit 6c928f12b2
3 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -991,10 +991,10 @@ module.exports = React.createClass({
// but it's better than the video going missing entirely
if (auxPanelMaxHeight < 50) auxPanelMaxHeight = 50;
// we may need to resize the gemini panel after changing the aux panel
// size, so add a callback to onChildResize.
this.setState({auxPanelMaxHeight: auxPanelMaxHeight},
this.onChildResize);
this.setState({auxPanelMaxHeight: auxPanelMaxHeight});
// changing the maxHeight on the auxpanel will trigger a callback go
// onChildResize, so no need to worry about that here.
},
onFullscreenClick: function() {
@ -1042,8 +1042,15 @@ 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);
}
},
// this has to be a proper method rather than an unnamed function,
// otherwise react calls it with null on each update.
_gatherTimelinePanelRef: function(r) {
this.refs.messagePanel = r;
if(r) {
this.updateTint();
}
},
@ -1206,7 +1213,7 @@ module.exports = React.createClass({
draggingFile={this.state.draggingFile}
displayConfCallNotification={this.state.displayConfCallNotification}
maxHeight={this.state.auxPanelMaxHeight}
onCallViewVideoRezize={this.onChildResize} >
onResize={this.onChildResize} >
{ aux }
</AuxPanel>
);
@ -1285,12 +1292,7 @@ module.exports = React.createClass({
}
var messagePanel = (
<TimelinePanel ref={(r) => {
this.refs.messagePanel = r;
if(r) {
this.updateTint();
}
}}
<TimelinePanel ref={this._gatherTimelinePanelRef}
room={this.state.room}
hidden={hideMessagePanel}
highlightedEventId={this.props.highlightedEventId}