Bug 1168585 - The buttons within the search box and within the search panel are blurry/pixelated on Windows HiDPI. r=Gijs
authorJared Wein <jwein@mozilla.com>
Wed, 27 May 2015 17:31:55 -0400
changeset 246003 cb827b44f564a552e4973dc3adf38ae812cefdd6
parent 246002 daeb053ca8d480235374e73b28c7a9ff0a907be9
child 246004 276bef47549224c2e86de2ded7bd5665576823b2
push id60333
push userryanvm@gmail.com
push dateThu, 28 May 2015 14:20:47 +0000
treeherdermozilla-inbound@8225a3b75df6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1168585
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1168585 - The buttons within the search box and within the search panel are blurry/pixelated on Windows HiDPI. r=Gijs
browser/themes/linux/jar.mn
browser/themes/osx/jar.mn
browser/themes/shared/search/search-indicator-add-engine.png
browser/themes/shared/search/search-indicator-add-engine@2x.png
browser/themes/windows/jar.mn
browser/themes/windows/searchbar.css
toolkit/themes/windows/mozapps/jar.mn
toolkit/themes/windows/mozapps/places/defaultFavicon@2x.png
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -88,17 +88,16 @@ browser.jar:
   skin/classic/browser/pointerLock-64.png
   skin/classic/browser/Privacy-16.png
   skin/classic/browser/privatebrowsing-mask.png
   skin/classic/browser/reload-stop-go.png
   skin/classic/browser/reload-stop-go@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/search-pref.png                      (../shared/search/search-pref.png)
   skin/classic/browser/search-indicator.png                 (../shared/search/search-indicator.png)
-  skin/classic/browser/search-indicator-add-engine.png      (../shared/search/search-indicator-add-engine.png)
   skin/classic/browser/search-engine-placeholder.png        (../shared/search/search-engine-placeholder.png)
   skin/classic/browser/badge-add-engine.png                 (../shared/search/badge-add-engine.png)
   skin/classic/browser/search-indicator-badge-add.png       (../shared/search/search-indicator-badge-add.png)
   skin/classic/browser/search-history-icon.svg              (../shared/search/history-icon.svg)
   skin/classic/browser/Secure.png
   skin/classic/browser/Security-broken.png
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/slowStartup-16.png
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -117,18 +117,16 @@ browser.jar:
   skin/classic/browser/searchbar-dropmarker.png
   skin/classic/browser/searchbar-dropmarker@2x.png
   skin/classic/browser/searchbar.css
   skin/classic/browser/Search.png
   skin/classic/browser/Search@2x.png
   skin/classic/browser/search-pref.png                         (../shared/search/search-pref.png)
   skin/classic/browser/search-indicator.png                    (../shared/search/search-indicator.png)
   skin/classic/browser/search-indicator@2x.png                 (../shared/search/search-indicator@2x.png)
-  skin/classic/browser/search-indicator-add-engine.png         (../shared/search/search-indicator-add-engine.png)
-  skin/classic/browser/search-indicator-add-engine@2x.png      (../shared/search/search-indicator-add-engine@2x.png)
   skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
   skin/classic/browser/search-engine-placeholder@2x.png        (../shared/search/search-engine-placeholder@2x.png)
   skin/classic/browser/badge-add-engine.png                    (../shared/search/badge-add-engine.png)
   skin/classic/browser/badge-add-engine@2x.png                 (../shared/search/badge-add-engine@2x.png)
   skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
   skin/classic/browser/search-indicator-badge-add@2x.png       (../shared/search/search-indicator-badge-add@2x.png)
   skin/classic/browser/search-history-icon.svg                 (../shared/search/history-icon.svg)
   skin/classic/browser/Secure-Glyph.png
deleted file mode 100644
index bff355bf486d4000cebfab154431e87e26329ace..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1565fc55df874fb19bed45f6063df110c8651a1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -108,20 +108,23 @@ browser.jar:
         skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7-tall.png
         skin/classic/browser/reload-stop-go.png
         skin/classic/browser/reload-stop-go@2x.png
         skin/classic/browser/searchbar.css
         skin/classic/browser/searchbar-dropdown-arrow.png
         skin/classic/browser/searchbar-dropdown-arrow-XP.png
         skin/classic/browser/search-pref.png                         (../shared/search/search-pref.png)
         skin/classic/browser/search-indicator.png                    (../shared/search/search-indicator.png)
-        skin/classic/browser/search-indicator-add-engine.png         (../shared/search/search-indicator-add-engine.png)
+        skin/classic/browser/search-indicator@2x.png                 (../shared/search/search-indicator@2x.png)
         skin/classic/browser/search-engine-placeholder.png           (../shared/search/search-engine-placeholder.png)
+        skin/classic/browser/search-engine-placeholder@2x.png        (../shared/search/search-engine-placeholder@2x.png)
         skin/classic/browser/badge-add-engine.png                    (../shared/search/badge-add-engine.png)
+        skin/classic/browser/badge-add-engine@2x.png                 (../shared/search/badge-add-engine@2x.png)
         skin/classic/browser/search-indicator-badge-add.png          (../shared/search/search-indicator-badge-add.png)
+        skin/classic/browser/search-indicator-badge-add@2x.png       (../shared/search/search-indicator-badge-add@2x.png)
         skin/classic/browser/search-history-icon.svg                 (../shared/search/history-icon.svg)
         skin/classic/browser/Secure24.png
         skin/classic/browser/Secure24-XP.png
         skin/classic/browser/setDesktopBackground.css
         skin/classic/browser/slowStartup-16.png
         skin/classic/browser/theme-switcher-icon.png                 (../shared/theme-switcher-icon.png)
         skin/classic/browser/Toolbar.png
         skin/classic/browser/Toolbar@2x.png
--- a/browser/themes/windows/searchbar.css
+++ b/browser/themes/windows/searchbar.css
@@ -3,16 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #PopupSearchAutoComplete {
   -moz-margin-start: -25px;
 }
 
 .searchbar-dropmarker-image {
   --searchbar-dropmarker-url: url("chrome://browser/skin/searchbar-dropdown-arrow.png");
+  --searchbar-dropmarker-2x-url: url("chrome://browser/skin/searchbar-dropmarker@2x.png");
 }
 
 .autocomplete-textbox-container {
   -moz-box-align: stretch;
 }
 
 .textbox-input-box {
   margin: 0;
@@ -42,16 +43,17 @@
   -moz-appearance: none;
   padding: 0;
   border: 0;
 }
 
 .searchbar-dropmarker-image {
   list-style-image: var(--searchbar-dropmarker-url);
   -moz-image-region: rect(0, 13px, 11px, 0);
+  width: 7px;
 }
 
 .searchbar-engine-button[open="true"] > .searchbar-dropmarker-image {
   -moz-image-region: rect(0, 26px, 11px, 13px);
 }
 
 
 /* ::::: search-go-button ::::: */
@@ -89,16 +91,17 @@
 }
 
 .searchbar-search-button {
   list-style-image: url("chrome://browser/skin/search-indicator.png");
   -moz-image-region: rect(0, 20px, 20px, 0);
   margin-top: 1px;
   margin-bottom: 1px;
   -moz-margin-start: 4px;
+  width: 20px;
 }
 
 .searchbar-search-button[addengines="true"] {
   list-style-image: url("chrome://browser/skin/search-indicator-badge-add.png");
 }
 
 .searchbar-search-button:hover {
   -moz-image-region: rect(0, 40px, 20px, 20px);
@@ -106,30 +109,70 @@
 
 .searchbar-search-button:hover:active {
   -moz-image-region: rect(0, 60px, 20px, 40px);
 }
 
 searchbar[oneoffui] .search-go-button {
   list-style-image: url("chrome://browser/skin/reload-stop-go.png");
   -moz-image-region: rect(0, 42px, 14px, 28px);
+  width: 14px;
 }
 
 searchbar[oneoffui] .search-go-button:hover {
   -moz-image-region: rect(14px, 42px, 28px, 28px);
 }
 
 searchbar[oneoffui] .search-go-button:hover:active {
   -moz-image-region: rect(28px, 42px, 42px, 28px);
 }
 
 searchbar[oneoffui] .search-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   transform: scaleX(-1);
 }
 
+@media (min-resolution: 1.1dppx) {
+  .searchbar-engine-image {
+    list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
+  }
+
+  .searchbar-dropmarker-image {
+    list-style-image: var(--searchbar-dropmarker-2x-url);
+  }
+
+  .searchbar-search-button {
+    list-style-image: url("chrome://browser/skin/search-indicator@2x.png");
+    -moz-image-region: rect(0, 40px, 40px, 0);
+  }
+
+  .searchbar-search-button[addengines="true"] {
+    list-style-image: url("chrome://browser/skin/search-indicator-badge-add@2x.png");
+  }
+
+  .searchbar-search-button:hover {
+    -moz-image-region: rect(0, 80px, 40px, 40px);
+  }
+
+  .searchbar-search-button:hover:active {
+    -moz-image-region: rect(0, 120px, 40px, 80px);
+  }
+
+  searchbar[oneoffui] .search-go-button {
+    list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
+    -moz-image-region: rect(0, 84px, 28px, 56px);
+  }
+
+  searchbar[oneoffui] .search-go-button:hover {
+    -moz-image-region: rect(28px, 84px, 56px, 56px);
+  }
+
+  searchbar[oneoffui] .search-go-button:hover:active {
+    -moz-image-region: rect(56px, 84px, 84px, 56px);
+  }
+}
 
 .search-panel-current-engine {
   border-top: none !important;
   -moz-box-align: center;
 }
 
 .search-panel-current-engine {
   border-bottom: 1px solid #ccc;
@@ -241,16 +284,26 @@ searchbar[oneoffui] .search-go-button:-m
   text-align: start;
   -moz-padding-start: 10px;
 }
 
 .addengine-item:not([image]) {
   list-style-image: url("chrome://browser/skin/search-engine-placeholder.png");
 }
 
+@media (min-resolution: 1.1dppx) {
+  .addengine-badge {
+    list-style-image: url("chrome://browser/skin/badge-add-engine@2x.png");
+  }
+
+  .addengine-item:not([image]) {
+    list-style-image: url("chrome://browser/skin/search-engine-placeholder@2x.png");
+  }
+}
+
 searchbar[oneoffui] .searchbar-engine-button {
   display: none;
 }
 
 .search-panel-tree > .autocomplete-treebody::-moz-tree-cell {
   border-top: none !important;
 }
 
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -46,16 +46,17 @@ toolkit.jar:
         skin/classic/mozapps/extensions/eula.css                   (extensions/eula.css)
 *       skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
         skin/classic/mozapps/handling/handling.css                 (handling/handling.css)
         skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
         skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
         skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
+        skin/classic/mozapps/places/defaultFavicon@2x.png          (places/defaultFavicon@2x.png)
 #endif
         skin/classic/mozapps/formautofill/requestAutocomplete.css  (../../shared/formautofill/requestAutocomplete.css)
         skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
         skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
         skin/classic/mozapps/aboutServiceWorkers.css               (../../shared/aboutServiceWorkers.css)
         skin/classic/mozapps/plugins/contentPluginActivate.png     (../../shared/plugins/contentPluginActivate.png)
         skin/classic/mozapps/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
         skin/classic/mozapps/plugins/contentPluginClose.png        (../../shared/plugins/contentPluginClose.png)
new file mode 100644
index 0000000000000000000000000000000000000000..052bfd301d8188f1ebd3234eb1421794fe527353
GIT binary patch
literal 477
zc$@*<0V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004`Nkl<Zc-rlk
zv1$TA5Qg&vSEkUUI7oWeE^tXI6RQ~SB;oK7wNeqpNAR&!#5YiEEPW0|!OSOFSJ>tX
z@36SyhuxiHzMq}FW%kZ>-II>Tqa(_tBu8^KJU5@upS#`eN2AfGMp0DteLs|Sg&4DD
zWXI#g$PEJ)OxVDk*=+U{hGDhUYJD}E%?cl0+W<Mq4FeWT*ciz5`~6P>!{IPkE|>NF
zeqWb$q!43UCLSk7PI3<hgBmQDuulfWnUA~0V(}w$PxL6t6GMz`nRv_?Ila|t^$SZB
zoDJwL+U<64GJi<$@Z}GOgQw5g*#LDyGA{B_k_KRC-r2xq-IymVWq8JbLTMQ=vP+;+
zD1ov{p#R^r3}{|v;8qNze+aXCAiD>$-!QuevU}h*?*SUc?RHyCp(#~XQ`&B~16t+D
zWb!KW0wxk@%TZxEoqASVJ{pYz9t*u*uQDEwz5kt1*AzL)-RX3`VZqb}ob`JBj-#}m
zX0Tww){j$nv)Pn!CFQ6k^*ALr3|KH>Up~+8MK7X~sEkY<85>#g_^}cUSep9>l>ICo
TwZ!z800000NkvXXu0mjfjK0|C