diff Devian.xml @ 93:f6fae1a4c66c v2.2.95-rc1

- revision and simplification dock layout - fixed character-specific addon choices getting erroneously toggled The XML template was missing header information; that has been filled in, and it should be easier to catch problems arising from that area.
author Nenue
date Wed, 19 Oct 2016 16:47:38 -0400
parents e89244da507b
children 33bc8baba858
line wrap: on
line diff
--- a/Devian.xml	Wed Aug 10 07:12:43 2016 -0400
+++ b/Devian.xml	Wed Oct 19 16:47:38 2016 -0400
@@ -1,4 +1,5 @@
-<Ui>
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
   <!--@no-lib-strip@-->
   <Script file="Libs\LibStub\LibStub.lua" />
   <Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml" />
@@ -34,6 +35,7 @@
           <Color a="1" r="1" g="1" b="1" />
           <TexCoords top="0.47" left="0" bottom="0.9" right="1" />
         </Texture>
+
       </Layer>
     </Layers>
   </Button>
@@ -46,6 +48,8 @@
     </Scripts>
   </Button>
 
+  <Font name="DevianDockHeader" font="Fonts\ARIALN.TTF" outline="NORMAL" virtual="true" height="14" />
+
   <Font name="DevianText" font="Interface\Addons\Devian\font\SourceCodePro-Regular.ttf" outline="NORMAL" virtual="true">
     <FontHeight>
       <AbsValue val="13" />
@@ -233,16 +237,10 @@
       hidden="true"
       frameStrata="LOW">
     <Scripts>
-      <OnEnter>
-        Devian.DockHighlight(self)
-      </OnEnter>
-      <OnLeave>
-        Devian.DockHighlight(self)
-      </OnLeave>
+      <OnMouseWheel>
+        Devian.Dock_OnMouseWheel(self, delta)
+      </OnMouseWheel>
     </Scripts>
-    <Anchors>
-      <Anchor point="TOP" relativePoint="TOP" x="0" y="1" />
-    </Anchors>
     <Size x="32" y="20" />
     <Layers>
       <Layer level="ARTWORK">
@@ -286,70 +284,56 @@
     </Layers>
   </Button>
 
-  <Button name="DevianBeacon" hidden="true" inherits="DevianButton" virtual="true" enableMouse="true" alpha="1" frameStrata="MEDIUM">
-    <Size x="64" y="32" />
+  <Button name="DevianBeacon" hidden="true" virtual="true" enableMouse="true" alpha="1" frameStrata="MEDIUM" mixin="DevianDockButtonMixin">
+    <Size x="64" y="24" />
 
     <Scripts>
-      <OnShow>
-        Devian.UpdateBeacon(self)
-      </OnShow>
-      <OnMouseDown>
-        --print("click", self:GetName(), button, self.console.index)
-        if button == "LeftButton" then
-          if IsShiftKeyDown() then
-            Devian:Console_Toggle(self.console.index, 0)
-          else
-            if self.console.index == Devian.currentProfile.current_channel or (not self.console.enabled) then
-              Devian:Console_Toggle(self.console.index)
-              if self.console.enabled then
-                if self.console.minimized then
-                  self.console:MinMax()
-                end
-                self.console:ToFront()
-              end
-            else
-              self.console:ToFront()
-            end
-          end
-        elseif button == "RightButton" then
-          self.console:MinMax()
-        end
-        self.console:Save()
-      </OnMouseDown>
-      <OnEnter>
-        --print(self:GetName(),'got mouse')
-        Devian.DockHighlight(self)
-      </OnEnter>
+      <OnShow method="OnShow" />
+      <OnEnter method="OnEnter" />
+      <OnMouseDown method="OnMouseDown" />
+      <OnClick method="Select" />
     </Scripts>
     <Layers>
+      <Layer level="BACKGROUND">
+        <Texture parentKey="Background" setAllPoints="true">
+          <Color a="0.5" r="0" g="0" b="0" />
+        </Texture>
+      </Layer>
       <Layer level="OVERLAY">
+        <Texture parentKey="Stripe">
+          <Anchors>
+            <Anchor point="TOPLEFT" />
+            <Anchor point="BOTTOMRIGHT" relativePoint="TOPRIGHT" x="0" y="-3" />
+          </Anchors>
+        </Texture>
       </Layer>
     </Layers>
     <Frames>
-      <Frame name="$parentText" parentKey="caption" alpha="0" blendMode="BLEND" enableMouse="false">
-        <Size x="100" y="30" />
+      <Frame name="$parentText" parentKey="caption" alpha="1" blendMode="BLEND" enableMouse="false">
+        <Size x="64" y="24" />
         <Anchors>
           <Anchor point="BOTTOM" relativePoint="BOTTOM" x="0" y="0" />
         </Anchors>
         <Layers>
           <Layer level="OVERLAY">
-            <FontString text="Test String" inherits="DevianText" parentKey="name" setAllPoints="true">
+            <FontString text="Test String" inherits="DevianDockHeader" parentKey="name" wordwrap="false" setAllPoints="true">
+              <Anchors>
+                <Anchor point="BOTTOM" />
+              </Anchors>
               <Color r="1" g="1" b="1" a="1" />
               <Shadow>
                 <Color r="0" g="0" b="0" a="1" />
                 <Offset x="0" y="-2" />
               </Shadow>
-              <Animations>
-                <AnimationGroup>
-                  <Scale scaleX="1.4" scaleY="1.4" looping="NONE">
-                    <Origin point="CENTER" x="0" y="0" />
-
-                  </Scale>
-                </AnimationGroup>
-              </Animations>
             </FontString>
           </Layer>
         </Layers>
+        <Animations>
+          <AnimationGroup parentKey="pulse" looping="BOUNCE" setToFinalAlpha="false">
+            <Alpha fromAlpha=".5" toAlpha="1" duration="0.4" endDelay="0.6" order="1" childKey="name" />
+
+          </AnimationGroup>
+        </Animations>
       </Frame>
     </Frames>
   </Button>