PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4825 from matrix-org/travis/room-list/default-lists

Browse source 
Allow the user to resize the new sublists to 1 tile
This commit is contained in:
Travis Ralston 2020-06-25 07:18:26 -06:00 committed by GitHub
commit 4d47dcaabd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/rooms/RoomSublist2.tsx
View file

@ -117,7 +117,7 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
}; };
private onShowLessClick = () => { private onShowLessClick = () => {
this.props.layout.visibleTiles = this.props.layout.minVisibleTiles; this.props.layout.visibleTiles = this.props.layout.defaultVisibleTiles;
this.forceUpdate(); // because the layout doesn't trigger a re-render this.forceUpdate(); // because the layout doesn't trigger a re-render
}; };

9
src/stores/room-list/ListLayout.ts
View file

@ -67,6 +67,7 @@ export class ListLayout {
} }
public get visibleTiles(): number { public get visibleTiles(): number {
if (this._n === 0) return this.defaultVisibleTiles;
return Math.max(this._n, this.minVisibleTiles); return Math.max(this._n, this.minVisibleTiles);
} }
@ -78,7 +79,13 @@ export class ListLayout {
public get minVisibleTiles(): number { public get minVisibleTiles(): number {
// the .65 comes from the CSS where the show more button is // the .65 comes from the CSS where the show more button is
// mathematically 65% of a tile when floating. // mathematically 65% of a tile when floating.
return 4.65; return 1.65;
}
public get defaultVisibleTiles(): number {
// TODO: Remove dogfood flag
const val = Number(localStorage.getItem("mx_dogfood_rl_defTiles") || 4);
return val + 0.65; // see minVisibleTiles for where the .65 comes from
} }
public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number { public calculateTilesToPixelsMin(maxTiles: number, n: number, possiblePadding: number): number {