OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4964 from matrix-org/travis/room-list/extra-tiles 

Fix extra room tiles being rendered on smaller sublists
pull/21833/head
Travis Ralston 2020-07-13 13:21:15 -06:00 committed by GitHub
parent 1f57b85b30 8e982f52ff
commit 2125293794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats 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; let padding = RESIZE_HANDLE_HEIGHT;
// this is used for calculating the max height of the whole container, // 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 // 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, // when fully expanded. We cannot check against the layout's defaultVisible tile count
// but in this case it will take the space of a tile and we don't need to reserve space for it. // because there are conditions in which we need to know that the 'show more' button
if (this.numTiles > this.layout.defaultVisibleTiles) { // is present while well under the default tile limit.
if (this.numTiles > this.numVisibleTiles) {
padding += SHOW_N_BUTTON_HEIGHT; padding += SHOW_N_BUTTON_HEIGHT;
} }
return padding; return padding;