From 138de053cef7b27d44afafe9d978a3230d3ab5aa Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Sun, 9 Mar 2025 11:14:41 +0200
Subject: [PATCH] Add support for hiding icons manually

---
 keepassxc-browser/_locales/en/messages.json | 4 ++++
 keepassxc-browser/content/pwgen.js          | 5 +++++
 keepassxc-browser/content/totp-field.js     | 5 +++++
 keepassxc-browser/content/username-field.js | 5 +++++
 keepassxc-browser/options/options.html      | 5 +++++
 5 files changed, 24 insertions(+)

diff --git a/keepassxc-browser/_locales/en/messages.json b/keepassxc-browser/_locales/en/messages.json
index c7cc480..ecfa3c7 100644
--- a/keepassxc-browser/_locales/en/messages.json
+++ b/keepassxc-browser/_locales/en/messages.json
@@ -906,6 +906,10 @@
         "message": "Adds an icon to input fields that are recognized as OTP/2FA.",
         "description": "OTP field icon option help text."
     },
+    "optionsHideIconsAlertText": {
+        "message": "You can also hide icons manually when needed with shift+click.",
+        "description": "Hide icons alert text text."
+    },
     "optionsAutoRetrieveCredentialsHelpText": {
         "message": "KeePassXC-Browser will immediately retrieve credentials when a tab is activated.",
         "description": "Auto-Retrive Credentials option help text."
diff --git a/keepassxc-browser/content/pwgen.js b/keepassxc-browser/content/pwgen.js
index 38ceb16..c9a3bf5 100644
--- a/keepassxc-browser/content/pwgen.js
+++ b/keepassxc-browser/content/pwgen.js
@@ -74,6 +74,11 @@ PasswordIcon.prototype.createIcon = function(field) {
             return;
         }
 
+        if (e.shiftKey) {
+            icon.style.display = 'none';
+            return;
+        }
+
         e.stopPropagation();
         kpxcPasswordGenerator.showPasswordGenerator(field);
     });
diff --git a/keepassxc-browser/content/totp-field.js b/keepassxc-browser/content/totp-field.js
index 2df7445..8dcbc6a 100644
--- a/keepassxc-browser/content/totp-field.js
+++ b/keepassxc-browser/content/totp-field.js
@@ -164,6 +164,11 @@ TOTPFieldIcon.prototype.createIcon = function(field, segmented = false) {
             return;
         }
 
+        if (e.shiftKey) {
+            icon.style.display = 'none';
+            return;
+        }
+
         e.stopPropagation();
         await kpxc.receiveCredentialsIfNecessary();
         kpxcFill.fillFromTOTP(field);
diff --git a/keepassxc-browser/content/username-field.js b/keepassxc-browser/content/username-field.js
index 9fe9fb7..6f3afb1 100644
--- a/keepassxc-browser/content/username-field.js
+++ b/keepassxc-browser/content/username-field.js
@@ -96,6 +96,11 @@ UsernameFieldIcon.prototype.createIcon = function(field) {
             return;
         }
 
+        if (e.shiftKey) {
+            icon.style.display = 'none';
+            return;
+        }
+
         e.stopPropagation();
         iconClicked(field, icon);
     });
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html
index 3e3769c..366e521 100644
--- a/keepassxc-browser/options/options.html
+++ b/keepassxc-browser/options/options.html
@@ -119,6 +119,11 @@
                     </div>
                   </div>
 
+                  <div class="alert alert-secondary mt-3 col-lg-9" role="alert" id="iconAlert">
+                    <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                    <span data-i18n="optionsHideIconsAlertText"></span>
+                  </div>
+
                   <!-- Show notifications -->
                   <div class="form-group">
                     <div class="form-check">