Commit 4975ed27 authored by Ivaria's avatar Ivaria
Browse files

First round of misc fixes for Dragonflight

parent 0c4a6c4a
......@@ -26,7 +26,7 @@ externals:
Libs/LibCustomGlow-1.0:
url: https://github.com/Stanzilla/LibCustomGlow
Libs/NickTag-1.0:
url: https://github.com/Tercioo/NickTag-1.0
url: https://github.com/Ivaria/NickTag-1.0
VuhDoOptions/Libs/ChatThrottleLib: svn://svn.wowace.com/wow/chatthrottlelib/mainline/trunk
......
......@@ -4,7 +4,7 @@
<Script file="LibStub\LibStub.lua" />
<Include file="Taintless\Taintless.xml" />
<!-- <Include file="Taintless\Taintless.xml" /> -->
<Include file="CallbackHandler-1.0\CallbackHandler-1.0.xml" />
<Include file="AceAddon-3.0\AceAddon-3.0.xml" />
<Include file="AceGUI-3.0\AceGUI-3.0.xml" />
......@@ -21,6 +21,6 @@
<Include file="LibCompress\lib.xml" />
<Script file="LibBase64-1.0\LibBase64-1.0.lua" />
<Include file="LibCustomGlow-1.0\LibCustomGlow-1.0.xml" />
<Include file="NickTag-1.0\NickTag-1.0.xml" />
<Include file="NickTag-1.0\NickTag-1.0.xml" />
</Ui>
## Interface: 90207
## Interface: 100002
## Title: VuhDo ['vu:du:]
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
......
......@@ -388,7 +388,7 @@ end
local tPosition;
function VUHDO_savePanelCoords(aPanel)
tPosition = VUHDO_PANEL_SETUP[VUHDO_getPanelNum(aPanel)]["POSITION"];
tPosition["orientation"], _, tPosition["relativePoint"], tPosition["x"], tPosition["y"] = aPanel:GetPoint(0);
tPosition["orientation"], _, tPosition["relativePoint"], tPosition["x"], tPosition["y"] = aPanel:GetPoint();
tPosition["width"] = aPanel:GetWidth();
tPosition["height"] = aPanel:GetHeight();
end
......
......@@ -339,7 +339,7 @@ local function VUHDO_customizeHotIcons(aButton, aHotName, aRest, aTimes, anIcon,
end
end
tIcon:SetVertexColor(tHotColor["R"], tHotColor["G"], tHotColor["B"], tIsChargeAlpha and tHotColor["O"]);
tIcon:SetVertexColor(tHotColor["R"], tHotColor["G"], tHotColor["B"], tIsChargeAlpha and tHotColor["O"] or 1);
if tIsChargeShown then
tChargeTexture:SetTexture(VUHDO_CHARGE_TEXTURES[aTimes]);
......
......@@ -233,7 +233,7 @@
</Frame>
<Frame name="VuhDoBuffWatchMainFrameTemplate" virtual="true" toplevel="true" frameStrata="MEDIUM"
movable="true" parent="UIParent" enableMouse="true" inherit="BackdropTemplate" mixin="BackdropTemplateMixin">
movable="true" parent="UIParent" enableMouse="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_BUFF_WATCH_MAIN_FRAME_16_16_5555" type="global" />
</KeyValues>
......
......@@ -351,12 +351,7 @@
<DisabledTexture file="Interface\AddOns\VuhDoOptions\Images\button_pressed_128_32">
<TexCoords left="0" right="1" top="0" bottom="1" />
</DisabledTexture>
<DisabledFont inherits="VuDoDefaultFontTemplate">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.6" g="0.2" b="0.2" />
</DisabledFont>
<DisabledFont style="VuDoButtonFont" />
<ButtonText name="$parentText" justifyV="TOP" justifyH="LEFT" maxLines="2">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPLEFT">
......@@ -369,18 +364,8 @@
<AbsValue val="8" />
</FontHeight>
</ButtonText>
<NormalFont style="VuDoButtonFont">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.4" g="0.4" b="1" />
</NormalFont>
<HighlightFont style="VuDoButtonFontLight">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.6" g="0.6" b="1" />
</HighlightFont>
<NormalFont style="VuDoButtonFont" />
<HighlightFont style="VuDoButtonFontLight" />
<Scripts>
<OnShow>VUHDO_lnfPatchFont(self, "Text");</OnShow>
<OnEnter>VUHDO_lnfShowTooltip(self)</OnEnter>
......@@ -399,12 +384,7 @@
<DisabledTexture file="Interface\AddOns\VuhDoOptions\Images\button_pressed_128_32">
<TexCoords left="0" right="1" top="0" bottom="1" />
</DisabledTexture>
<DisabledFont inherits="VuDoDefaultFontTemplate">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.6" g="0.2" b="0.2" />
</DisabledFont>
<DisabledFont style="VuDoButtonFont" />
<ButtonText name="$parentText" justifyV="TOP" justifyH="LEFT" maxLines="2">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPLEFT">
......@@ -417,18 +397,8 @@
<AbsValue val="8" />
</FontHeight>
</ButtonText>
<NormalFont style="VuDoButtonFontDark">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.4" g="0.4" b="1" />
</NormalFont>
<HighlightFont style="VuDoButtonFont">
<FontHeight>
<AbsValue val="9" />
</FontHeight>
<Color r="0.6" g="0.6" b="1" />
</HighlightFont>
<NormalFont style="VuDoButtonFontDark" />
<HighlightFont style="VuDoButtonFont" />
<Scripts>
<OnShow>VUHDO_lnfPatchFont(self, "Text");</OnShow>
<OnEnter>VUHDO_lnfShowTooltip(self)</OnEnter>
......
## Interface: 90207
## Interface: 100002
## Title: VuhDo ['vu:du:] - Options
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
......
......@@ -232,7 +232,7 @@
<Layers>
<Layer level="OVERLAY">
-- Raid Icon
<Texture name="$parentIc50" toplevel="true" hidden="true" file="interface\targetingframe\ui-raidtargetingicons">
<Texture name="$parentIc50" hidden="true" file="interface\targetingframe\ui-raidtargetingicons">
</Texture>
</Layer>
</Layers>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment