Hide inline encryption icons except when hovering over a message

Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
This commit is contained in:
Eric Newport 2018-04-22 22:30:37 -04:00
parent 44d92bb32e
commit d42fa9d17a
5 changed files with 22 additions and 1 deletions

View file

@ -298,6 +298,16 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_EventTile_e2eIcon[hidden] {
display: none;
}
/* always override hidden attribute for blocked and warning */
.mx_EventTile_e2eIcon[hidden][src="img/e2e-blocked.svg"],
.mx_EventTile_e2eIcon[hidden][src="img/e2e-warning.svg"] {
display: block;
}
.mx_EventTile_keyRequestInfo { .mx_EventTile_keyRequestInfo {
font-size: 12px; font-size: 12px;
} }

View file

@ -63,6 +63,7 @@ const gHVersionLabel = function(repo, token='') {
const SIMPLE_SETTINGS = [ const SIMPLE_SETTINGS = [
{ id: "urlPreviewsEnabled" }, { id: "urlPreviewsEnabled" },
{ id: "autoplayGifsAndVideos" }, { id: "autoplayGifsAndVideos" },
{ id: "alwaysShowEncryptionIcons" },
{ id: "hideReadReceipts" }, { id: "hideReadReceipts" },
{ id: "dontSendTypingNotifications" }, { id: "dontSendTypingNotifications" },
{ id: "alwaysShowTimestamps" }, { id: "alwaysShowTimestamps" },

View file

@ -742,7 +742,11 @@ function E2ePadlockUnencrypted(props) {
} }
function E2ePadlock(props) { function E2ePadlock(props) {
if (SettingsStore.getValue("alwaysShowEncryptionIcons")) {
return <img className="mx_EventTile_e2eIcon" {...props} />; return <img className="mx_EventTile_e2eIcon" {...props} />;
} else {
return <img className="mx_EventTile_e2eIcon" hidden {...props} />;
}
} }
module.exports.getHandlerTile = getHandlerTile; module.exports.getHandlerTile = getHandlerTile;

View file

@ -198,6 +198,7 @@
"Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)", "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
"Always show message timestamps": "Always show message timestamps", "Always show message timestamps": "Always show message timestamps",
"Autoplay GIFs and videos": "Autoplay GIFs and videos", "Autoplay GIFs and videos": "Autoplay GIFs and videos",
"Always show encryption icons": "Always show encryption icons",
"Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting", "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
"Hide avatars in user and room mentions": "Hide avatars in user and room mentions", "Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
"Disable big emoji in chat": "Disable big emoji in chat", "Disable big emoji in chat": "Disable big emoji in chat",

View file

@ -150,6 +150,11 @@ export const SETTINGS = {
displayName: _td('Autoplay GIFs and videos'), displayName: _td('Autoplay GIFs and videos'),
default: false, default: false,
}, },
"alwaysShowEncryptionIcons": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Always show encryption icons'),
default: true,
},
"enableSyntaxHighlightLanguageDetection": { "enableSyntaxHighlightLanguageDetection": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Enable automatic language detection for syntax highlighting'), displayName: _td('Enable automatic language detection for syntax highlighting'),