[Pkg-mozext-commits] [tabmixplus] 27/34: Follow up bug 1275262 - implement device sharing animation on background tabs

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 28f006a30ede34010992dcd4587b4e8265defaef
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Jun 24 12:20:53 2016 +0300

    Follow up bug 1275262 - implement device sharing animation on background tabs
---
 chrome/content/overlay/browser.css  |  5 +++++
 chrome/content/tab/tab.js           |  5 +++++
 chrome/content/tab/tabbrowser_4.xml | 30 +++++++++++++++++-------------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/chrome/content/overlay/browser.css b/chrome/content/overlay/browser.css
index 0c26dd8..7a0a4b2 100644
--- a/chrome/content/overlay/browser.css
+++ b/chrome/content/overlay/browser.css
@@ -55,6 +55,11 @@ vbox[shortcutsLabels="true"] {
   -moz-box-ordinal-group: 1 !important;
 }
 
+.tabbrowser-tabs[closebuttons-side="left"][closebuttons-hover="notactivetab"] > .tabbrowser-tab:not([selected="true"]) > .tab-stack > .tab-content > .tab-sharing-icon-overlay,
+.tabbrowser-tabs[closebuttons-side="left"][closebuttons-hover="alltabs"] > .tabbrowser-tab > .tab-stack > .tab-content > .tab-sharing-icon-overlay {
+  -moz-box-ordinal-group: 2 !important;
+}
+
 .tabbrowser-tabs[closebuttons-side="left"][closebuttons-hover="notactivetab"] > .tabbrowser-tab:not([selected="true"]) > .tab-stack > .tab-content > .tab-icon-overlay,
 .tabbrowser-tabs[closebuttons-side="left"][closebuttons-hover="alltabs"] > .tabbrowser-tab > .tab-stack > .tab-content > .tab-icon-overlay {
   -moz-box-ordinal-group: 2 !important;
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index f99b0b0..f2276d7 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -1818,6 +1818,11 @@ gTMPprefObserver = {
       this.insertRule('.tab-icon-sound {display: none;}');
     }
 
+    /* tab-sharing-icon-overlay added by Bug 1275262, Firefox 50+ */
+    if (!Tabmix.isVersion(500)) {
+      this.insertRule('.tab-sharing-icon-overlay {display: none;}');
+    }
+
     // height shrink to actual size when the tabbar is in display: block (multi-row)
     let newRule = '#TabsToolbar[tabmix-show-newtabbutton*="aftertabs"] >' +
                   '#tabbrowser-tabs:not([overflow="true"]) > .tabbrowser-arrowscrollbox[flowing="multibar"]' +
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index a46c5f4..83b8fcc 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -56,19 +56,23 @@
         </xul:vbox>
         <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged,attention"
                   class="tab-content" align="center">
-            <xul:stack class="tab-icon" xbl:inherits="fadein,pinned,selected,visuallyselected">
-              <xul:image xbl:inherits="fadein,pinned,busy,progress,selected,visuallyselected"
-                         class="tab-throbber"
-                         role="presentation"/>
-              <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed"
-                         anonid="tab-icon-image"
-                         class="tab-icon-image"
-                         validate="never"
-                         role="presentation"/>
-              <xul:image class="tab-protect-icon" />
-              <xul:image class="tab-lock-icon"/>
-              <xul:image class="tab-reload-icon"/>
-            </xul:stack>
+          <xul:stack class="tab-icon" xbl:inherits="fadein,pinned,selected,visuallyselected">
+            <xul:image xbl:inherits="fadein,pinned,busy,progress,selected,visuallyselected"
+                       class="tab-throbber"
+                       role="presentation"/>
+            <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed,sharing"
+                       anonid="tab-icon-image"
+                       class="tab-icon-image"
+                       validate="never"
+                       role="presentation"/>
+            <xul:image class="tab-protect-icon"/>
+            <xul:image class="tab-lock-icon"/>
+            <xul:image class="tab-reload-icon"/>
+          </xul:stack>
+          <xul:image xbl:inherits="sharing,selected"
+                     anonid="sharing-icon"
+                     class="tab-sharing-icon-overlay"
+                     role="presentation"/>
           <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted"
                      anonid="overlay-icon"
                      class="tab-icon-overlay"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git