set sub list height with flex-basis to make it ... well, grow less

This commit is contained in:
Bruno Windels 2018-10-18 16:57:47 +02:00
parent d264687796
commit 44b92eb071
3 changed files with 3 additions and 4 deletions

View file

@ -16,13 +16,12 @@ limitations under the License.
.mx_RoomSubList { .mx_RoomSubList {
min-height: 80px; min-height: 80px;
flex: 1; flex: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.mx_RoomSubList_hidden { .mx_RoomSubList_hidden {
flex: 0;
min-height: unset; min-height: unset;
} }

View file

@ -370,8 +370,9 @@ const RoomSubList = React.createClass({
{this._getHeaderJsx()} {this._getHeaderJsx()}
</div>; </div>;
} else { } else {
const heightEstimation = (len * 40) + 31;
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper"); const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
return <div className={"mx_RoomSubList"} style={{flexGrow: len}}> return <div className={"mx_RoomSubList"} style={{flexBasis: heightEstimation}}>
{this._getHeaderJsx()} {this._getHeaderJsx()}
<GeminiScrollbarWrapper> <GeminiScrollbarWrapper>
{ content } { content }

View file

@ -99,7 +99,6 @@ class Sizer {
class FlexSizer extends Sizer { class FlexSizer extends Sizer {
setItemSize(item, size) { setItemSize(item, size) {
item.style.flexGrow = '0';
item.style.flexBasis = `${Math.round(size)}px`; item.style.flexBasis = `${Math.round(size)}px`;
} }
} }