Merge pull request #181 from tophf/icon16px

Use 16/32px icon in new MD toolbar
stylish-userstyles · Sep 1, 2016 · c6df61b · c6df61b
2 parents a5e3a1e + e154494
commit c6df61b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/16w.png b/16w.png
diff --git a/32.png b/32.png
diff --git a/32w.png b/32w.png
diff --git a/manifest.json b/manifest.json
@@ -51,6 +51,8 @@
 	"options_page": "manage.html",
 	"browser_action": {
 		"default_icon": {
+			"16": "16w.png",
+			"32": "32w.png",
 			"19": "19w.png",
 			"38": "38w.png"
 		},

diff --git a/messaging.js b/messaging.js
@@ -47,7 +47,12 @@ function updateIcon(tab, styles) {
 		var disableAll = "disableAll" in styles ? styles.disableAll : prefs.get("disableAll");
 		var postfix = styles.length == 0 || disableAll ? "w" : "";
 		chrome.browserAction.setIcon({
-			path: {19: "19" + postfix + ".png", 38: "38" + postfix + ".png"},
+			path: {
+				// Material Design 2016 new size is 16px
+				16: "16" + postfix + ".png", 32: "32" + postfix + ".png",
+				// Chromium forks or non-chromium browsers may still use the traditional 19px
+				19: "19" + postfix + ".png", 38: "38" + postfix + ".png",
+			},
 			tabId: tab.id
 		}, function() {
 			// if the tab was just closed an error may occur,