Mercurial > wow > buffalo2

diff ObjectiveTracker.xml @ 14:ed642234f017

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ObjectiveFrame - implement proper tracker name text - expanded tracker prototypes to cover "objective lines" formatting and accommodation of widget variables - implement the progress bars for bonus objectives ObjectiveStyle - moved `UpdateWrapperStyle` over and renamed it to fit semantics - change the formula for block.`height` to measure non-widget content only - allows widgets to position relative to text - size FontString `status` to match block.`height` - full block height is acquired by adding block.`height` and block.`attachmentHeight` which is calculated during objective parsing ObjectiveWidgets - use string keys for generated widgets to deal with multiple objectives under the same questID, and maybe dungeon objectives - wrapper buttons use a common code path - specialized handlers for wheel scrolling moved over to fit semantics
author Nenue
date Mon, 04 Apr 2016 03:16:22 -0400
parents 9455693fc290
children 880828018bf4
line wrap: on
line diff
--- a/ObjectiveTracker.xml	Sat Apr 02 17:46:52 2016 -0400
+++ b/ObjectiveTracker.xml	Mon Apr 04 03:16:22 2016 -0400
@@ -1,33 +1,6 @@
 <Ui>
 
-
-  <Texture name="VnTestLine" virtual="true">
-    <Color r="1" g="1" b="0" a="1" />
-  </Texture>
-
-  <Font name="VeneerTitleFont" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16" >
-    <Color r="1" g=".80" b=".25" a="1" />
-  </Font>
-
-  <Font name="VeneerCriteriaFontNormal" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16">
-    <Color r="1" g="1" b="1" a="1" />
-  </Font>
-  <Font name="VeneerCriteriaFontComplete" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16">
-    <Color r="0" g="1" b="0" a=".75" />
-  </Font>
-  <Font name="VeneerCriteriaFontProgressed" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16">
-    <Color r="1" g="1" b="0" a="1" />
-  </Font>
-
-  <Font name="VeneerCriteriaFontFailed" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="16">
-    <Color r="1" g=".4" b="0" a=".75" />
-  </Font>
-
-  <Font name="VeneerStatusFont" virtual="true" font="Fonts\FRIZQT__.TTF" outline="NORMAL" height="14">
-    <Color r="1" g="1" b="0" a="1" />
-  </Font>
-
-  <Frame name="VeneerObjectiveWrapper" parent="UIParent" movable="true" enableMouse="true">
+  <Frame name="VeneerObjectiveWrapper" parent="UIParent" movable="true" enableMouse="true" frameStrata="LOW">
     <Scripts>
       <OnLoad>
         self.toggle = true
@@ -92,11 +65,6 @@
         </Texture>-->
       </Layer>
       <Layer level="OVERLAY">
-        <FontString name="$parentTitle" parentKey="title" inherits="VeneerStatusFont">
-          <Anchors>
-            <Anchor point="LEFT" />
-          </Anchors>
-        </FontString>
 
         <!--<Texture name="$parentTCR" parentKey="outlineClosed" file="Interface\FrameGeneral\UI-Frame">
           <Size x="40" y="30" />
@@ -111,51 +79,6 @@
     </Layers>
     <Frames>
 
-      <Frame name="$parentXP" parentKey="XPBar" hidden="true">
-        <Size x="250" y="24" />
-        <Anchors>
-          <Anchor point="TOPLEFT" />
-        </Anchors>
-        <Layers>
-          <Layer level="BACKGROUND">
-            <Texture name="$parentBackground" parentKey="statusbg" setAllPoints="true"/>
-          </Layer>
-          <Layer level="ARTWORK">
-
-            <Texture name="$parentForeground" parentKey="foreground">
-              <Anchors>
-                <Anchor point="TOPLEFT" />
-                <Anchor point="BOTTOMLEFT" />
-              </Anchors>
-            </Texture>
-            <Texture name="$parentRested" parentKey="rested" >
-              <Anchors>
-                <Anchor point="TOPLEFT" />
-                <Anchor point="BOTTOMLEFT" />
-              </Anchors>
-            </Texture>
-          </Layer>
-          <Layer level="OVERLAY">
-            <FontString inherits="VeneerFontNormal" parentKey="title">
-              <Anchors>
-                <Anchor point="CENTER" />
-              </Anchors>
-            </FontString>
-          </Layer>
-        </Layers>
-      </Frame>
-
-      <Button name="$parentClose" parentKey="close" inherits="UIPanelCloseButtonNoScripts" enableMouseWheel="true" enableMouse="true">
-
-        <NormalTexture file="Interface\PaperDollInfoFrame\UI-Character-SkillsPageDown-Up" />
-        <PushedTexture file="Interface\PaperDollInfoFrame\UI-Character-SkillsPageDown-Down" />
-        <Anchors>
-          <Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT" x="-2" y="2" />
-        </Anchors>
-        <Layers>
-        </Layers>
-      </Button>
-
       <ScrollFrame name="$parentScrollFrame" enableMouseWheel="true" parentKey="scrollArea" parentArray="minimizeFrames">
         <Layers>
           <Layer level="BACKGROUND">
@@ -184,9 +107,77 @@
           -->
         </Frames>
       </ScrollFrame>
+
+      <Frame name="$parentStatusHeader" parentKey="header" frameStrata="MEDIUM">
+        <Layers>
+          <Layer level="OVERLAY">
+            <FontString name="$parentTitle" parentKey="status" inherits="VeneerStatusFont" text="status test" justifyH="RIGHT">
+              <Anchors>
+                <Anchor point="TOPRIGHT" x="-64" y="0" />
+              </Anchors>
+            </FontString>
+          </Layer>
+        </Layers>
+      </Frame>
+
+      <Button name="$parentCloseButton" parentKey="CloseButton" enableMouse="true" frameStrata="MEDIUM">
+        <Size x="16" y="16" />
+        <HighlightTexture file="Interface\Buttons\UI-Panel-MinimizeButton-Highlight" alphaMode="ADD"/>
+        <Anchors>
+          <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" x="-2" y="0" />
+        </Anchors>
+      </Button>
+
+      <Button name="$parentQuestMapButton" parentArray="minimizeFrames" parentKey="QuestMapButton" frameStrata="MEDIUM">
+        <Size x="42" y="16" />
+        <HighlightTexture file="Interface\Buttons\UI-Panel-MinimizeButton-Highlight" alphaMode="ADD"/>
+        <Anchors>
+          <Anchor point="TOPRIGHT" relativePoint="TOPLEFT" relativeKey="$parent.CloseButton" x="0" y="0" />
+        </Anchors>
+      </Button>
     </Frames>
   </Frame>
 
+
+
+
+  <Frame name="$parentXP" parent="VeneerObjectiveWrapper" parentKey="XPBar" hidden="true">
+    <Size x="250" y="24" />
+    <Anchors>
+      <Anchor point="TOPLEFT" />
+    </Anchors>
+    <Layers>
+      <Layer level="BACKGROUND">
+        <Texture name="$parentBackground" parentKey="statusbg" setAllPoints="true"/>
+      </Layer>
+      <Layer level="ARTWORK">
+
+        <Texture name="$parentForeground" parentKey="foreground">
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+            <Anchor point="BOTTOMLEFT" />
+          </Anchors>
+        </Texture>
+        <Texture name="$parentRested" parentKey="rested" >
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+            <Anchor point="BOTTOMLEFT" />
+          </Anchors>
+        </Texture>
+      </Layer>
+      <Layer level="OVERLAY">
+        <FontString inherits="VeneerFontNormal" parentKey="title">
+          <Anchors>
+            <Anchor point="CENTER" />
+          </Anchors>
+        </FontString>
+      </Layer>
+    </Layers>
+  </Frame>
+
+  <!-- Header Panel -->
+
+  <!-- Background panels -->
   <Frame name="VeneerObjectiveScroll" parent="VeneerObjectiveWrapperScrollFrame">
     <Anchors>
       <Anchor point="TOPLEFT" />
@@ -209,8 +200,8 @@
       <Layer level="BACKGROUND">
         <Texture name="$parentTitleBackground" parentKey="titlebg">
           <Anchors>
-            <Anchor point="TOPLEFT" relativePoint="TOPLEFT" />
-            <Anchor point="RIGHT" relativePoint="RIGHT" />
+            <Anchor point="TOPLEFT" />
+            <Anchor point="RIGHT" />
           </Anchors>
           <Color r="1" g="1" b="1" a="1" />
           <Gradient orientation="HORIZONTAL">
@@ -220,9 +211,20 @@
         </Texture>
       </Layer>
       <Layer level="OVERLAY">
-        <FontString name="$parentTitle" inherits="VeneerFontHighlight" text="OBJ" parentKey="title">
+        <FontString name="$parentTitle" inherits="VeneerFontHighlight" text="OBJ" parentKey="title" justifyH="LEFT">
           <Anchors>
-            <Anchor point="TOPLEFT" />
+            <Anchor point="TOP" relativeKey="$parent.titlebg" />
+            <Anchor point="BOTTOM" relativeKey="$parent.titlebg"  />
+            <Anchor point="LEFT" relativeKey="$parent.titlebg" />
+            <Anchor point="RIGHT" relativeKey="$parent" />
+          </Anchors>
+        </FontString>
+        <FontString name="$parentStatus" inherits="VeneerStatusFont" parentKey="status" justifyH="RIGHT">
+          <Anchors>
+            <Anchor point="TOP" relativeKey="$parent.titlebg" />
+            <Anchor point="BOTTOM" relativeKey="$parent.titlebg"  />
+            <Anchor point="LEFT" relativeKey="$parent.titlebg" />
+            <Anchor point="RIGHT" relativeKey="$parent" />
           </Anchors>
         </FontString>
       </Layer>
@@ -297,7 +299,6 @@
         <FontString name="$parentStatus" parentKey="status" inherits="VeneerCriteriaFontNormal" justifyH="LEFT" justifyV="MIDDLE" wordwrap="true">
           <Anchors>
             <Anchor point="TOP" relativeKey="$parent.statusbg" />
-            <Anchor point="BOTTOM" relativeKey="$parent.statusbg"  />
             <Anchor point="LEFT"  relativeKey="$parent.statusbg" />
             <Anchor point="RIGHT" relativeKey="$parent.statusbg" />
           </Anchors>