Bug 1012445 - Implement NS_THEME_CHECKMENUITEM for Mac OS X, css part…

…. r=dao.
mozilla-spidermonkey · Jul 4, 2014 · f07cd2f · f07cd2f
1 parent 2e1469c
commit f07cd2f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 31 deletions.
diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn
@@ -181,8 +181,6 @@ toolkit.jar:
   skin/classic/global/media/videoClickToPlayButton.svg               (media/videoClickToPlayButton.svg)
   skin/classic/global/menu/menu-arrow.png                            (menu/menu-arrow.png)
   skin/classic/global/menu/menu-arrow@2x.png                         (menu/menu-arrow@2x.png)
-  skin/classic/global/menu/menu-check.png                            (menu/menu-check.png)
-  skin/classic/global/menu/menu-check@2x.png                         (menu/menu-check@2x.png)
   skin/classic/global/menu/shared-menu-check.png                     (../../shared/menu-check.png)
   skin/classic/global/menu/shared-menu-check@2x.png                  (../../shared/menu-check@2x.png)
   skin/classic/global/scale/scale-tray-horiz.gif                     (scale/scale-tray-horiz.gif)

diff --git a/toolkit/themes/osx/global/menu.css b/toolkit/themes/osx/global/menu.css
@@ -185,35 +185,9 @@ menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left {
 
 /* ::::: checked menuitems ::::: */
 
-:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left,
-:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left {
-  padding-top: 1px;
-  -moz-margin-start: -15px;
-  -moz-padding-start: 15px;
-  background: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 11, 11, 0) bottom left no-repeat transparent;
-}
-
-:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left:-moz-locale-dir(rtl),
-:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left:-moz-locale-dir(rtl) {
-  background-position: bottom right;
-}
-
-:not(menulist) > menupopup > menuitem[checked="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left,
-:not(menulist) > menupopup > menuitem[selected="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left {
-  background-image: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 22, 11, 11);
-}
-
-@media (min-resolution: 2dppx) {
-  :not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left,
-  :not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left {
-    background-size: 11px 11px;
-    background-image: -moz-image-rect("chrome://global/skin/menu/menu-check@2x.png", 0, 22, 22, 0);
-  }
-
-  :not(menulist) > menupopup > menuitem[checked="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left,
-  :not(menulist) > menupopup > menuitem[selected="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left {
-    background-image: -moz-image-rect("chrome://global/skin/menu/menu-check@2x.png", 0, 44, 22, 22);
-  }
+:not(menulist) > menupopup > menuitem[checked="true"],
+:not(menulist) > menupopup > menuitem[selected="true"] {
+  -moz-appearance: checkmenuitem;
 }
 
 menulist:not([editable="true"]) > menupopup > menuitem[checked="true"]::before,

diff --git a/toolkit/themes/osx/global/menu/menu-check.png b/toolkit/themes/osx/global/menu/menu-check.png
diff --git a/toolkit/themes/osx/global/menu/menu-check@2x.png b/toolkit/themes/osx/global/menu/menu-check@2x.png