diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss index 85b8f73d64..31996f23a2 100644 --- a/res/css/structures/_RoomSubList.scss +++ b/res/css/structures/_RoomSubList.scss @@ -132,6 +132,11 @@ limitations under the License. transform: rotateZ(-90deg); } +.mx_RoomSubList .gm-scrollbar-container { + /* let rooms list grab all available space */ + flex: 1; +} + .collapsed { .mx_RoomSubList_label { height: 17px; diff --git a/src/Tinter.js b/src/Tinter.js index cd87d31ca8..de9ae94097 100644 --- a/src/Tinter.js +++ b/src/Tinter.js @@ -155,7 +155,7 @@ class Tinter { tint(primaryColor, secondaryColor, tertiaryColor) { return; - + // eslint-disable-next-line no-unreachable this.currentTint[0] = primaryColor; this.currentTint[1] = secondaryColor; this.currentTint[2] = tertiaryColor; diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js index db600abbf2..9d5f54d338 100644 --- a/src/components/structures/LoggedInView.js +++ b/src/components/structures/LoggedInView.js @@ -412,6 +412,10 @@ const LoggedInView = React.createClass({ this.setState({mouseDown: null}); }, + _setResizeContainerRef(div) { + this.resizeContainer = div; + }, + render: function() { const LeftPanel = sdk.getComponent('structures.LeftPanel'); const RightPanel = sdk.getComponent('structures.RightPanel'); @@ -558,7 +562,7 @@ const LoggedInView = React.createClass({
{ topBar } -
this.resizeContainer = div} className={bodyClasses}> +
@@ -43,10 +42,10 @@ class TopLeftMenu extends React.Component {
{ name }
- +
); } } -module.exports = TopLeftMenu; \ No newline at end of file +module.exports = TopLeftMenu; diff --git a/src/resizer/resizer.js b/src/resizer/resizer.js index f207f4a215..c5112e5139 100644 --- a/src/resizer/resizer.js +++ b/src/resizer/resizer.js @@ -40,7 +40,7 @@ export class Resizer { vertical: "resizer-vertical", resizing: "resizer-resizing", }; - this.mouseDownHandler = (event) => this._onMouseDown(event); + this._onMouseDown = this._onMouseDown.bind(this); } setClassNames(classNames) { @@ -48,11 +48,11 @@ export class Resizer { } attach() { - this.container.addEventListener("mousedown", this.mouseDownHandler, false); + this.container.addEventListener("mousedown", this._onMouseDown, false); } detach() { - this.container.removeEventListener("mousedown", this.mouseDownHandler, false); + this.container.removeEventListener("mousedown", this._onMouseDown, false); } /**