matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-13 08:02:38 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into element

Browse Source
This commit is contained in:
J. Ryan Stinnett
2020-07-13 20:28:57 +01:00
parent 995a7879a1 edb19786ec
commit b50c809d35
6 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/rooms/RoomSublist2.tsx
View File

@@ -137,9 +137,10 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
let padding = RESIZE_HANDLE_HEIGHT;
// this is used for calculating the max height of the whole container,
// and takes into account whether there should be room reserved for the show less button
// when fully expanded. Note that the show more button might still be shown when not fully expanded,
// but in this case it will take the space of a tile and we don't need to reserve space for it.
if (this.numTiles > this.layout.defaultVisibleTiles) {
// when fully expanded. We cannot check against the layout's defaultVisible tile count
// because there are conditions in which we need to know that the 'show more' button
// is present while well under the default tile limit.
if (this.numTiles > this.numVisibleTiles) {
padding += SHOW_N_BUTTON_HEIGHT;
}
return padding;