matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-16 06:42:26 +03:00
Code Activity

Merge pull request #4033 from TestardR/feature/padLockInviteOnly

Browse Source 
Collapsed room list has unaligned room tiles #4030 version 2
This commit is contained in:
Travis Ralston
2020-02-24 09:59:26 -07:00
committed by GitHub
parent 64dc776e43 d2e7cc7f19
commit 2cb699ae8b
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/InviteOnlyIcon.js
View File

@@ -37,6 +37,8 @@ export default class InviteOnlyIcon extends React.Component {
};
render() {
const classes = this.props.collapsedPanel ? "mx_InviteOnlyIcon_small": "mx_InviteOnlyIcon_large";
if (!SettingsStore.isFeatureEnabled("feature_invite_only_padlocks")) {
return null;
}
@@ -46,7 +48,7 @@ export default class InviteOnlyIcon extends React.Component {
if (this.state.hover) {
tooltip = <Tooltip className="mx_InviteOnlyIcon_tooltip" label={_t("Invite only")} dir="auto" />;
}
return (<div className="mx_InviteOnlyIcon"
return (<div className={classes}
onMouseEnter={this.onHoverStart}
onMouseLeave={this.onHoverEnd}
>

2
src/components/views/rooms/RoomTile.js
View File

@@ -528,7 +528,7 @@ export default createReactClass({
let privateIcon = null;
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
if (this.state.joinRule == "invite" && !dmUserId) {
privateIcon = <InviteOnlyIcon />;
privateIcon = <InviteOnlyIcon collapsedPanel={this.props.collapsed} />;
}
}