corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1811128 - Use 16/32px extension icons in toolbars. r=rpl,dao

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D167573
This commit is contained in:
William Durand
2023-01-30 10:46:12 +00:00
parent 2a16a072a0
commit d42c7aaa29
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
browser/base/content/browser.css
View File

@@ -439,15 +439,15 @@ toolbarpaletteitem {
list-style-image: var(--webextension-toolbar-image-dark, inherit); list-style-image: var(--webextension-toolbar-image-dark, inherit);
} }
toolbaritem[cui-areatype="panel"] > .webextension-browser-action { toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action {
list-style-image: var(--webextension-menupanel-image, inherit); list-style-image: var(--webextension-menupanel-image, inherit);
} }
:root[lwt-popup-brighttext] toolbaritem[cui-areatype="panel"] > .webextension-browser-action { :root[lwt-popup-brighttext] toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action {
list-style-image: var(--webextension-menupanel-image-light, inherit); list-style-image: var(--webextension-menupanel-image-light, inherit);
} }
:root:not([lwt-popup-brighttext]) toolbaritem[cui-areatype="panel"] > .webextension-browser-action:-moz-lwtheme { :root:not([lwt-popup-brighttext]) toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action:-moz-lwtheme {
list-style-image: var(--webextension-menupanel-image-dark, inherit); list-style-image: var(--webextension-menupanel-image-dark, inherit);
} }
@@ -469,15 +469,15 @@ toolbarpaletteitem {
list-style-image: var(--webextension-toolbar-image-2x-dark, inherit); list-style-image: var(--webextension-toolbar-image-2x-dark, inherit);
} }
toolbaritem[cui-areatype="panel"] > .webextension-browser-action { toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action {
list-style-image: var(--webextension-menupanel-image-2x, inherit); list-style-image: var(--webextension-menupanel-image-2x, inherit);
} }
:root[lwt-popup-brighttext] toolbaritem[cui-areatype="panel"] > .webextension-browser-action { :root[lwt-popup-brighttext] toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action {
list-style-image: var(--webextension-menupanel-image-2x-light, inherit); list-style-image: var(--webextension-menupanel-image-2x-light, inherit);
} }
:root:not([lwt-popup-brighttext]) toolbaritem[cui-areatype="panel"] > .webextension-browser-action:-moz-lwtheme { :root:not([lwt-popup-brighttext]) toolbaritem:is([overflowedItem="true"], [cui-areatype="panel"]) > .webextension-browser-action:-moz-lwtheme {
list-style-image: var(--webextension-menupanel-image-2x-dark, inherit); list-style-image: var(--webextension-menupanel-image-2x-dark, inherit);
} }

5
browser/components/extensions/parent/ext-browserAction.js
View File

@@ -905,14 +905,15 @@ this.browserAction = class extends ExtensionAPIPersistent {
`; `;
}; };
let icon16 = IconDetails.getPreferredIcon(icons, this.extension, 16).icon;
let icon32 = IconDetails.getPreferredIcon(icons, this.extension, 32).icon; let icon32 = IconDetails.getPreferredIcon(icons, this.extension, 32).icon;
let icon64 = IconDetails.getPreferredIcon(icons, this.extension, 64).icon; let icon64 = IconDetails.getPreferredIcon(icons, this.extension, 64).icon;
return ` return `
${getStyle("menupanel-image", icon32)} ${getStyle("menupanel-image", icon32)}
${getStyle("menupanel-image-2x", icon64)} ${getStyle("menupanel-image-2x", icon64)}
${getStyle("toolbar-image", icon32)} ${getStyle("toolbar-image", icon16)}
${getStyle("toolbar-image-2x", icon64)} ${getStyle("toolbar-image-2x", icon32)}
`; `;
} }

34
browser/components/extensions/test/browser/browser_ext_browserAction_pageAction_icon.js
View File

@@ -92,7 +92,7 @@ add_task(async function testDetailsObjects() {
details: { path: { "19": "a.png", "38": "a-x2.png" } }, details: { path: { "19": "a.png", "38": "a-x2.png" } },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a-x2.png"), browserActionImageURL: browser.runtime.getURL("data/a.png"),
pageActionImageURL: browser.runtime.getURL("data/a.png"), pageActionImageURL: browser.runtime.getURL("data/a.png"),
}, },
"2": { "2": {
@@ -107,11 +107,11 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a-32.png"), browserActionImageURL: browser.runtime.getURL("data/a-16.png"),
pageActionImageURL: browser.runtime.getURL("data/a-16.png"), pageActionImageURL: browser.runtime.getURL("data/a-16.png"),
}, },
"2": { "2": {
browserActionImageURL: browser.runtime.getURL("data/a-64.png"), browserActionImageURL: browser.runtime.getURL("data/a-32.png"),
pageActionImageURL: browser.runtime.getURL("data/a-32.png"), pageActionImageURL: browser.runtime.getURL("data/a-32.png"),
}, },
}, },
@@ -185,7 +185,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: imageData.green.url, browserActionImageURL: imageData.red.url,
pageActionImageURL: imageData.red.url, pageActionImageURL: imageData.red.url,
}, },
"2": { "2": {
@@ -206,7 +206,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: imageData.red.url, browserActionImageURL: browser.runtime.getURL("data/a.png"),
pageActionImageURL: browser.runtime.getURL("data/a.png"), pageActionImageURL: browser.runtime.getURL("data/a.png"),
}, },
"2": { "2": {
@@ -222,7 +222,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a.png"), browserActionImageURL: imageData.red.url,
pageActionImageURL: imageData.red.url, pageActionImageURL: imageData.red.url,
}, },
"2": { "2": {
@@ -240,7 +240,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: imageData.red.url, browserActionImageURL: browser.runtime.getURL("data/a.png"),
pageActionImageURL: browser.runtime.getURL("data/a.png"), pageActionImageURL: browser.runtime.getURL("data/a.png"),
}, },
"2": { "2": {
@@ -256,7 +256,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a.png"), browserActionImageURL: imageData.red.url,
pageActionImageURL: imageData.red.url, pageActionImageURL: imageData.red.url,
}, },
"2": { "2": {
@@ -271,7 +271,7 @@ add_task(async function testDetailsObjects() {
details: { path: { "18": "a.png", "36": "a-x2.png" } }, details: { path: { "18": "a.png", "36": "a-x2.png" } },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a-x2.png"), browserActionImageURL: browser.runtime.getURL("data/a.png"),
pageActionImageURL: browser.runtime.getURL("data/a.png"), pageActionImageURL: browser.runtime.getURL("data/a.png"),
}, },
"2": { "2": {
@@ -284,7 +284,7 @@ add_task(async function testDetailsObjects() {
details: { path: { "16": "a.png", "30": "a-x2.png" } }, details: { path: { "16": "a.png", "30": "a-x2.png" } },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/a-x2.png"), browserActionImageURL: browser.runtime.getURL("data/a.png"),
pageActionImageURL: browser.runtime.getURL("data/a.png"), pageActionImageURL: browser.runtime.getURL("data/a.png"),
}, },
"2": { "2": {
@@ -297,7 +297,7 @@ add_task(async function testDetailsObjects() {
details: { path: { "16": "16.png", "100": "100.png" } }, details: { path: { "16": "16.png", "100": "100.png" } },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/100.png"), browserActionImageURL: browser.runtime.getURL("data/16.png"),
pageActionImageURL: browser.runtime.getURL("data/16.png"), pageActionImageURL: browser.runtime.getURL("data/16.png"),
}, },
"2": { "2": {
@@ -328,7 +328,7 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/18.svg"), browserActionImageURL: browser.runtime.getURL("data/16.svg"),
pageActionImageURL: browser.runtime.getURL("data/16.svg"), pageActionImageURL: browser.runtime.getURL("data/16.svg"),
}, },
"2": { "2": {
@@ -349,11 +349,11 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/36.png"), browserActionImageURL: browser.runtime.getURL("data/18.png"),
pageActionImageURL: browser.runtime.getURL("data/18.png"), pageActionImageURL: browser.runtime.getURL("data/18.png"),
}, },
"2": { "2": {
browserActionImageURL: browser.runtime.getURL("data/128.png"), browserActionImageURL: browser.runtime.getURL("data/36.png"),
pageActionImageURL: browser.runtime.getURL("data/36.png"), pageActionImageURL: browser.runtime.getURL("data/36.png"),
}, },
}, },
@@ -375,11 +375,11 @@ add_task(async function testDetailsObjects() {
}, },
resolutions: { resolutions: {
"1": { "1": {
browserActionImageURL: browser.runtime.getURL("data/32.png"), browserActionImageURL: browser.runtime.getURL("data/16.png"),
pageActionImageURL: browser.runtime.getURL("data/16.png"), pageActionImageURL: browser.runtime.getURL("data/16.png"),
}, },
"2": { "2": {
browserActionImageURL: browser.runtime.getURL("data/64.png"), browserActionImageURL: browser.runtime.getURL("data/32.png"),
pageActionImageURL: browser.runtime.getURL("data/32.png"), pageActionImageURL: browser.runtime.getURL("data/32.png"),
}, },
}, },
@@ -403,7 +403,7 @@ add_task(async function testDetailsObjects() {
pageActionImageURL: browser.runtime.getURL("data/32.png"), pageActionImageURL: browser.runtime.getURL("data/32.png"),
}, },
"2": { "2": {
browserActionImageURL: browser.runtime.getURL("data/128.png"), browserActionImageURL: browser.runtime.getURL("data/32.png"),
pageActionImageURL: browser.runtime.getURL("data/32.png"), pageActionImageURL: browser.runtime.getURL("data/32.png"),
}, },
}, },