prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2152 from stefansundin/fix-monochrome-icon-in-chrome

Browse source 
Fix monochrome icon in Chrome when `colorTheme == 'system'` (MV3 fix)
This commit is contained in:
Sami Vänttinen 2024-05-27 19:06:34 +03:00 committed by GitHub
commit cd3b2dc236
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 53 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc
View file

@ -159,6 +159,7 @@
"Pixels": true,
"PREDEFINED_SITELIST": true,
"RED_BUTTON": true,
"retrieveColorScheme": true,
"sendMessage": true,
"showNotification": true,
"siteMatch": true,

1
dist/manifest_chromium.json vendored
View file

@ -143,6 +143,7 @@
"cookies",
"nativeMessaging",
"notifications",
"offscreen",
"storage",
"tabs",
"webNavigation",

1
dist/manifest_firefox.json vendored
View file

@ -38,6 +38,7 @@
"background/client.js",
"background/keepass.js",
"background/httpauth.js",
"background/offscreen.js",
"background/browserAction.js",
"background/page.js",
"background/event.js",

1
keepassxc-browser/background/background_service.js
View file

@ -10,6 +10,7 @@ try {
'client.js',
'keepass.js',
'httpauth.js',
'offscreen.js',
'browserAction.js',
'page.js',
'event.js',

2
keepassxc-browser/background/browserAction.js
View file

@ -89,7 +89,7 @@ browserAction.generateIconName = async function(iconType) {
let style = 'colored';
if (page.settings.useMonochromeToolbarIcon) {
if (page.settings.colorTheme === 'system') {
style = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
style = await retrieveColorScheme();
} else {
style = page.settings.colorTheme;
}

31
keepassxc-browser/background/offscreen.js Normal file
View file

@ -0,0 +1,31 @@
'use strict';
async function retrieveColorScheme() {
if (typeof window !== 'undefined') {
// Firefox does not support the offscreen API but its background script still has a window (so far)
return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
}
const offscreenUrl = browser.runtime.getURL('offscreen/offscreen.html');
const existingContexts = await browser.runtime.getContexts({
contextTypes: [ 'OFFSCREEN_DOCUMENT' ],
documentUrls: [ offscreenUrl ],
});
if (existingContexts.length === 0) {
await browser.offscreen.createDocument({
url: offscreenUrl,
reasons: [ 'MATCH_MEDIA' ],
justification: 'Retrieve color scheme',
});
}
const style = await browser.runtime.sendMessage({
target: 'offscreen',
action: 'retrieve_color_scheme',
});
if (!style) {
// if messaging fails then use "light" icon
return 'light';
}
return style;
}

1
keepassxc-browser/manifest.json
View file

@ -40,6 +40,7 @@
"background/client.js",
"background/keepass.js",
"background/httpauth.js",
"background/offscreen.js",
"background/browserAction.js",
"background/page.js",
"background/event.js",

7
keepassxc-browser/offscreen/offscreen.html Normal file
View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="offscreen.js"></script>
</head>
<body></body>
</html>

9
keepassxc-browser/offscreen/offscreen.js Normal file
View file

@ -0,0 +1,9 @@
chrome.runtime.onMessage.addListener(({ target, action }, sender, sendResponse) => {
if (target !== 'offscreen') {
return;
}
if (action === 'retrieve_color_scheme') {
const style = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
sendResponse(style);
}
});