[Pkg-mozext-commits] [tabmixplus] 11/23: Follow up bug 1297157 - Abstract away the visuallyselected attribute on anonymous tab nodes

[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 e79b4f14ce528560e916164172b0f56e6569cb27
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Sep 1 23:34:39 2016 +0300

    Follow up bug 1297157 - Abstract away the visuallyselected attribute on anonymous tab nodes
---
 chrome/content/tab/tabbrowser_4.xml | 71 ++++++++++++++++++++++++++++++++++---
 chrome/content/tabmix.js            |  5 +++
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 83b8fcc..7eec9f4 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -35,8 +35,8 @@
     </content>
   </binding>
 
-  <binding id="tabmix-tabbrowser-tab" display="xul:hbox"
-            extends="chrome://tabmixplus/content/tab/tabbrowser_proxy.xml#tabmix-tabbrowser-tab-proxy">
+  <binding id="tabmix-tabbrowser-tab-before-v51" display="xul:hbox"
+           extends="chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab">
     <content context="tabContextMenu">
       <xul:hbox class="tab-image-left tab-startcap tab-left tab-left-border" xbl:inherits="selected,hover"/>
       <xul:hbox class="tab-drag-indicator-left"/>
@@ -73,7 +73,7 @@
                      anonid="sharing-icon"
                      class="tab-sharing-icon-overlay"
                      role="presentation"/>
-          <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted"
+          <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted,visuallyselected"
                      anonid="overlay-icon"
                      class="tab-icon-overlay"
                      role="presentation"/>
@@ -82,7 +82,7 @@
                      xbl:inherits="value=label,visibleLabel,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
                      class="tab-text tab-label"
                      role="presentation"/>
-          <xul:image xbl:inherits="soundplaying,pinned,muted"
+          <xul:image xbl:inherits="soundplaying,pinned,muted,visuallyselected"
                      anonid="soundplaying-icon"
                      class="tab-icon-sound"
                      role="presentation"/>
@@ -94,6 +94,69 @@
       <xul:hbox class="tab-drag-indicator-right"/>
       <xul:hbox class="tab-image-right tab-endcap tab-right tab-right-border" xbl:inherits="selected,hover"/>
     </content>
+  </binding>
+
+  <binding id="tabmix-tabbrowser-tab" display="xul:hbox"
+            extends="chrome://tabmixplus/content/tab/tabbrowser_proxy.xml#tabmix-tabbrowser-tab-proxy">
+    <content context="tabContextMenu">
+      <xul:hbox xbl:inherits="selected=visuallyselected,hover"
+                class="tab-image-left tab-startcap tab-left tab-left-border"/>
+      <xul:hbox class="tab-drag-indicator-left"/>
+      <xul:stack class="tab-stack" flex="1">
+        <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged,fadein"
+                  class="tab-background">
+          <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+                    class="tab-background-start"/>
+          <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+                    class="tab-background-middle"/>
+          <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+                    class="tab-background-end"/>
+        </xul:hbox>
+        <xul:vbox class="tab-progress-container">
+          <xul:progressmeter class="tab-progress" mode="normal"
+                             xbl:inherits="value=tab-progress,fadein,pinned,selected=visuallyselected"/>
+        </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,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=visuallyselected"
+                     anonid="sharing-icon"
+                     class="tab-sharing-icon-overlay"
+                     role="presentation"/>
+          <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted,selected=visuallyselected"
+                     anonid="overlay-icon"
+                     class="tab-icon-overlay"
+                     role="presentation"/>
+          <xul:label flex="1"
+                     anonid="tab-label" tabmix="true"
+                     xbl:inherits="value=label,visibleLabel,crop,accesskey,fadein,pinned,selected=visuallyselected,attention"
+                     class="tab-text tab-label"
+                     role="presentation"/>
+          <xul:image xbl:inherits="soundplaying,pinned,muted,selected=visuallyselected"
+                     anonid="soundplaying-icon"
+                     class="tab-icon-sound"
+                     role="presentation"/>
+          <xul:toolbarbutton anonid="tmp-close-button"
+                             xbl:inherits="fadein,pinned,selected=visuallyselected"
+                             class="tab-close-button close-icon"/>
+        </xul:hbox>
+      </xul:stack>
+      <xul:hbox class="tab-drag-indicator-right"/>
+      <xul:hbox xbl:inherits="selected=visuallyselected,hover"
+                class="tab-image-right tab-endcap tab-right tab-right-border"/>
+    </content>
 
     <implementation>
     <constructor>
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 340de69..1be5065 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -323,6 +323,11 @@ var TMP_eventListener = {
   },
 
   onContentLoaded: function TMP_EL_onContentLoaded() {
+    if (!Tabmix.isVersion(510)) {
+      let newRule = '.tabbrowser-tab {' +
+          '-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab-before-v51") !important;}';
+      gTMPprefObserver.insertRule(newRule);
+    }
     if (Tabmix.isVersion(280) && !Tabmix.isVersion(470)) {
       let newRule = '.tabbrowser-tab > .tab-stack > .tab-content > .tab-label[tabmix="true"] {' +
         '-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tab-label") !important;}';

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