Bug 462967 - Update full screen window controls on windows theme. r=rflint
authorDão Gottwald <dao@mozilla.com>
Thu, 11 Jun 2009 10:39:09 +0200
changeset 25927 2175a36f4456055c05e031d0df3c1028c7e72f7f
parent 25926 11e696c5cfc3324669f35bda411a39e9fb1caae3
child 25928 58d0cf56d8598e6b54049d77b673f03a7699617f
push id1677
push userdgottwald@mozilla.com
push dateThu, 11 Jun 2009 08:44:57 +0000
reviewersrflint
bugs462967
milestone1.9.1pre
Bug 462967 - Update full screen window controls on windows theme. r=rflint
browser/themes/winstripe/browser/browser-aero.css
browser/themes/winstripe/browser/browser.css
toolkit/themes/winstripe/global/icons/windowControls-aero.png
toolkit/themes/winstripe/global/icons/windowControls.png
toolkit/themes/winstripe/global/jar.mn
--- a/browser/themes/winstripe/browser/browser-aero.css
+++ b/browser/themes/winstripe/browser/browser-aero.css
@@ -70,9 +70,32 @@
   -moz-appearance: -moz-win-glass;
   -moz-border-radius: 0;
   border: none;
   font: "Segoe UI", window;
   font-weight: normal;
   color: black;
   text-shadow: white -1px -1px .5em, white -1px 1px .5em, white 1px 1px .5em, white 1px -1px .5em;
 }
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-box-align: start;
+}
+
+#minimize-button,
+#restore-button,
+#close-button {
+  -moz-appearance: none;
+  border-style: none;
+  margin: 0;
+}
+#close-button {
+  -moz-image-region: rect(0, 49px, 16px, 32px);
+}
+#close-button:hover {
+  -moz-image-region: rect(16px, 49px, 32px, 32px);
+}
+#close-button:hover:active {
+  -moz-image-region: rect(32px, 49px, 48px, 32px);
+}
 %endif
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1005,31 +1005,52 @@ toolbar[iconsize="small"] #paste-button[
   -moz-image-region: rect(32px 224px 48px 208px);
 }
 toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   -moz-image-region: rect(64px 224px 80px 208px);
 }
 
 /* ::::: fullscreen window controls ::::: */
 
-#window-controls {
-  -moz-box-align: start;
+#minimize-button,
+#restore-button,
+#close-button {
+  list-style-image: url("chrome://global/skin/icons/windowControls.png");
   padding: 0;
-  border-left: 2px solid;
-  -moz-border-left-colors: ThreeDHighlight ThreeDShadow;
 }
 
 #minimize-button {
-  list-style-image: url("chrome://global/skin/icons/Minimize.gif");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+#minimize-button:hover {
+  -moz-image-region: rect(16px, 16px, 32px, 0);
+}
+#minimize-button:hover:active {
+  -moz-image-region: rect(32px, 16px, 48px, 0);
 }
 #restore-button {
-  list-style-image: url("chrome://global/skin/icons/Restore.gif");
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+#restore-button:hover {
+  -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+#restore-button:hover:active {
+  -moz-image-region: rect(32px, 32px, 48px, 16px);
 }
 #close-button {
-  list-style-image: url("chrome://global/skin/icons/Close.gif");
+  -moz-image-region: rect(0, 48px, 16px, 32px);
+  -moz-appearance: none;
+  border-style: none;
+  margin: 2px;
+}
+#close-button:hover {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+#close-button:hover:active {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
 }
 
 /* ::::: nav-bar-inner ::::: */
 
 #urlbar {
   width: 7em;
   min-width: 7em;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9925b842cfc862a681f667eb4dcbb05679e98226
GIT binary patch
literal 3001
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d90efb05b2d50fabc745c6dc2dfaa98f93686130
GIT binary patch
literal 2060
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
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -139,16 +139,17 @@ classic.jar:
         skin/classic/global/icons/warning-large.png              (icons/warning-large.png)
         skin/classic/global/icons/warning-16.png                 (icons/warning-16.png)
         skin/classic/global/icons/warning-24.png                 (icons/warning-24.png)
         skin/classic/global/icons/warning-64.png                 (icons/warning-64.png)
         skin/classic/global/icons/warningBar-30.png              (icons/warningBar-30.png)
         skin/classic/global/icons/warningBar-60.png              (icons/warningBar-60.png)
         skin/classic/global/icons/warningBarIcon-16.png          (icons/warningBarIcon-16.png)
         skin/classic/global/icons/warningGhosted-64.png          (icons/warningGhosted-64.png)
+        skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
         skin/classic/global/icons/wrap.png                       (icons/wrap.png)
         skin/classic/global/media/videocontrols.css              (media/videocontrols.css)
         skin/classic/global/media/pauseButton.png                (media/pauseButton.png)
         skin/classic/global/media/playButton.png                 (media/playButton.png)
         skin/classic/global/media/muteButton.png                 (media/muteButton.png)
         skin/classic/global/media/unmuteButton.png               (media/unmuteButton.png)
         skin/classic/global/media/scrubberThumb.png              (media/scrubberThumb.png)
         skin/classic/global/media/scrubberThumbWide.png          (media/scrubberThumbWide.png)
@@ -322,16 +323,17 @@ classic.jar:
         skin/classic/aero/global/icons/warning-large.png                 (icons/warning-large-aero.png)
         skin/classic/aero/global/icons/warning-16.png                    (icons/warning-16-aero.png)
         skin/classic/aero/global/icons/warning-24.png                    (icons/warning-24-aero.png)
         skin/classic/aero/global/icons/warning-64.png                    (icons/warning-64-aero.png)
         skin/classic/aero/global/icons/warningBar-30.png                 (icons/warningBar-30-aero.png)
         skin/classic/aero/global/icons/warningBar-60.png                 (icons/warningBar-60-aero.png)
         skin/classic/aero/global/icons/warningBarIcon-16.png             (icons/warningBarIcon-16-aero.png)
         skin/classic/aero/global/icons/warningGhosted-64.png             (icons/warningGhosted-64-aero.png)
+        skin/classic/aero/global/icons/windowControls.png                (icons/windowControls-aero.png)
         skin/classic/aero/global/icons/wrap.png                          (icons/wrap-aero.png)
         skin/classic/aero/global/media/videocontrols.css                 (media/videocontrols.css)
         skin/classic/aero/global/media/pauseButton.png                   (media/pauseButton.png)
         skin/classic/aero/global/media/playButton.png                    (media/playButton.png)
         skin/classic/aero/global/media/muteButton.png                    (media/muteButton.png)
         skin/classic/aero/global/media/unmuteButton.png                  (media/unmuteButton.png)
         skin/classic/aero/global/media/scrubberThumb.png                 (media/scrubberThumb.png)
         skin/classic/aero/global/media/scrubberThumbWide.png             (media/scrubberThumbWide.png)