Changeset 15033

Timestamp:

03/05/10 10:42:30 (5 months ago)

Author:

sam

Message:

max-button.png unique + contentTab flages en stack sur l'icône

Location:

trunk/Xul_Core/content/scenariCore/widgets/matrix

Files:

• img/bkMax.png (deleted)
• img/bkNorm.png (deleted)
• img/flags.png (added)
• img/max-button.png (added)
• matrix.xbl.css (modified) (3 diffs)
• slotContents.xbl.xml (modified) (1 diff)

trunk/Xul_Core/content/scenariCore/widgets/matrix/matrix.xbl.css

@@ -109 +109 @@
 /* ======================== maxBtn ======================== */ 
 toolbarbutton[anonid=maxBtn] {
-        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/bkMax.png");
+        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/max-button.png");
         -moz-image-region: rect(0px, 16px, 16px, 0px);
         padding: 0px 4px 0px 5px;
@@ -131 +131 @@
 }
 *[BlockMax=true] toolbarbutton[anonid=maxBtn] {
-        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/bkNorm.png");
+        -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+*[BlockMax=true] toolbarbutton[anonid=maxBtn]:hover {
+        -moz-image-region: rect(16px, 32px, 32px, 16px);
+}
+*[BlockMax=true] toolbarbutton[anonid=maxBtn]:active {
+        -moz-image-region: rect(16px, 48px, 32px, 32px);
 }
 
@@ -237 +243 @@
         display:none;
 }
-slotTabContent .tabLabelFlags image{
-        display:none;
-}
-slotTabContent[dirty] .tabLabelFlags .tabLabelFlagDirty{
-        display:inline;
-}
-slotTabContent[locked] .tabLabelFlags .tabLabelFlagLocked{
-        display:inline;
+slotTabContent .tabLabelFlags{
+        list-style-image: url("chrome://scenariCore/content/widgets/matrix/img/flags.png");
+        -moz-image-region: rect(0px, 23px, 16px, 0px);
+        width: 23px;
+        height: 16px;
+}
+slotTabContent[dirty] .tabLabelFlags{
+        -moz-image-region: rect(16px, 23px, 32px, 0px);
+}
+slotTabContent[locked] .tabLabelFlags{
+        -moz-image-region: rect(32px, 23px, 48px, 0px);
+}
+slotTabContent[dirty][locked] .tabLabelFlags{
+        -moz-image-region: rect(48px, 23px, 64px, 0px);
 }
 /* ======================== closeBtn ======================== */ 

trunk/Xul_Core/content/scenariCore/widgets/matrix/slotContents.xbl.xml

@@ -158 +158 @@
                                         <xul:stack>
                                                 <xul:hbox anonid="tabLabel" class="tabLabel" align="center">
-                                <xul:image class="tabLabelIco" xbl:inherits="src=image"/>
+                                                        <xul:stack>
+                                        <xul:image class="tabLabelIco" xbl:inherits="src=image"/>
+                                        <xul:image class="tabLabelFlags"/>
+                                                        </xul:stack>
                                         <xul:label class="small-margin tabLabelTxt" xbl:inherits="value=label" minwidth="20" crop="end"/>
-                                        <xul:hbox class="tabLabelFlags">
-                                        <xul:image class="tabLabelFlagDirty" src="chrome://scenariCore/content/widgets/matrix/img/dirty-flag.png"/>
-                                        <xul:image class="tabLabelFlagLocked" src="chrome://scenariCore/content/widgets/matrix/img/locked-flag.png"/>
-                                        </xul:hbox>
                                                 </xul:hbox>
                                                 <xul:hbox anonid="tabTools" class="tabTools" pack="end" align="top">