Skip to content

GitLab

Commit 0edd8143 authored by Ivaria's avatar Ivaria
Browse files

Merge branch 'shadowlands' into 'master' 

Shadowlands pre-patch

See merge request vuhdo/vuhdo!8
parents e1855909 9e7e4dfe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1264 additions and 1261 deletions
.release/release.sh
View file @ 0edd8143
......@@ -66,7 +66,7 @@ strtotime() {
exit_code=0
# Game versions for uploading
game_version="8.3.0"
game_version="9.0.1"
game_version_id=
toc_version=
classic=
......
Libs/Libs.xml
View file @ 0edd8143
......@@ -20,6 +20,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>
Libs/NickTag-1.0/NickTag-1.0.lua
View file @ 0edd8143
This diff is collapsed.
Libs/NickTag-1.0/NickTag-1.0.toc
View file @ 0edd8143
## Interface: 70200
## Title: NickTag-1.0
## Notes: Standalone version of the NickTag library.
NickTag-1.0.xml
## Interface: 80200
## Title: NickTag-1.0
## Notes: Standalone version of the NickTag library.
NickTag-1.0.xml
Libs/NickTag-1.0/NickTag-1.0.xml
View file @ 0edd8143
<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">
<Script file="NickTag-1.0.lua"/>
</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">
<Script file="NickTag-1.0.lua"/>
</Ui>
VuhDo.lua
View file @ 0edd8143
......@@ -47,6 +47,16 @@ VUHDO_PLAYER_NAME = nil;
VUHDO_PLAYER_RAID_ID = nil;
VUHDO_PLAYER_GROUP = nil;
-- Backdrops
BACKDROP_VUHDO_TOOLTIP = {
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
tile = true,
tileSize = 8,
edgeSize = 8,
insets = { left = 3, right = 3, top = 3, bottom = 3 },
};
-- BURST CACHE ---------------------------------------------------
local VUHDO_CONFIG;
local VUHDO_PET_2_OWNER;
......
VuhDo.toc
View file @ 0edd8143
## Interface: 80300
## Interface: 90002
## Title: VuhDo ['vu:du:]
## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
## Version: 3.114
## Version: 3.115
## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more
## SavedVariablesPerCharacter: VUHDO_CONFIG, VUHDO_PANEL_SETUP, VUHDO_SPELL_ASSIGNMENTS, VUHDO_HOSTILE_SPELL_ASSIGNMENTS, VUHDO_MM_SETTINGS, VUHDO_PLAYER_TARGETS, VUHDO_MAINTANK_NAMES, VUHDO_BUFF_SETTINGS, VUHDO_POWER_TYPE_COLORS, VUHDO_SPELLS_KEYBOARD, VUHDO_SPELL_CONFIG, VUHDO_BUFF_ORDER, VUHDO_SPEC_LAYOUTS, VUHDO_GROUP_SIZE, VUHDO_RAID, VUHDO_INDICATOR_CONFIG
## SavedVariables: VUHDO_DEFAULT_LAYOUT, VUHDO_DEFAULT_PROFILE, VUHDO_PROFILES, VUHDO_MANUAL_ROLES, VUHDO_SPELL_LAYOUTS, VUHDO_USER_CLASS_COLORS, VUHDO_DEBUFF_BLACKLIST, VUHDO_BOUQUETS, VUHDO_COMBAT_LOG_TRACE, VUHDO_GLOBAL_CONFIG, VUHDO_DEBUG
......
VuhDo.xml
View file @ 0edd8143
......@@ -101,7 +101,10 @@
</Scripts>
</Frame>
<Frame name="VuhDoTooltip" frameStrata="TOOLTIP" movable="true" parent="UIParent" hidden="true">
<Frame name="VuhDoTooltip" frameStrata="TOOLTIP" movable="true" parent="UIParent" hidden="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_TOOLTIP" type="global" />
</KeyValues>
<Layers>
<Layer level="ARTWORK">
<FontString name="$parentTextL1" inherits="GameFontNormalSmall" hidden="true">
......@@ -322,19 +325,6 @@
</FontString>
</Layer>
</Layers>
<Backdrop tile="true"
bgFile="Interface\Tooltips\UI-Tooltip-Background"
edgeFile="Interface\Tooltips\UI-Tooltip-Border">
<EdgeSize>
<AbsValue val="8"/>
</EdgeSize>
<TileSize>
<AbsValue val="8"/>
</TileSize>
<BackgroundInsets>
<AbsInset left="3" right="3" top="3" bottom="3"/>
</BackgroundInsets>
</Backdrop>
<Scripts>
<OnMouseDown>VuhDoTooltipOnMouseDown(self,arg1)</OnMouseDown>
<OnMouseUp>VuhDoTooltipOnMouseUp(self,arg1)</OnMouseUp>
......
VuhDoAoeAdvisor.lua
View file @ 0edd8143
......@@ -228,7 +228,13 @@ function VUHDO_aoeUpdateSpellAverages()
tSpellModi = tInfo["base"] / tInfo["divisor"];
tInfo["avg"] = floor((tInfo["base"] + tBonus * tSpellModi) + 0.5);
end
tInfo["thresh"] = VUHDO_CONFIG["AOE_ADVISOR"]["config"][tName]["thresh"];
-- FIXME: as of 9.0.1 PLAYER_EQUIPMENT_CHANGED sometimes fires before VUHDO_CONFIG is loaded and available
if VUHDO_CONFIG then
tInfo["thresh"] = VUHDO_CONFIG["AOE_ADVISOR"]["config"][tName]["thresh"];
elseif not tInfo["thresh"] then
tInfo["thresh"] = 8000; -- FIXME: current lowest threshold
end
--print("VUHDO_aoeUpdateSpellAverages(): name = " .. tName .. ", avg = floor((base + bonus * spellMod) + 0.5) | " .. tInfo["avg"] .. " = floor((" .. tInfo["base"] .. " + " .. tBonus .. " * " .. tSpellModi .. ") + 0.5)");
end
end
......
VuhDoBouquetValidators.lua
View file @ 0edd8143
......@@ -205,7 +205,7 @@ end
--
local function VUHDO_isPhasedValidator(anInfo, _)
if UnitIsWarModePhased(anInfo["unit"]) or not UnitInPhase(anInfo["unit"]) then
if UnitPhaseReason(anInfo["unit"]) then
return true, "Interface\\TargetingFrame\\UI-PhasingIcon",
-1, -1, -1, nil, nil, 0.15625, 0.84375, 0.15625, 0.84375;
else
......@@ -217,12 +217,16 @@ end
--
local function VUHDO_isWarModePhasedValidator(anInfo, _)
if UnitIsWarModePhased(anInfo["unit"]) then
local tPhaseReason = UnitPhaseReason(anInfo["unit"]);
if tPhaseReason and tPhaseReason == Enum.PhaseReason.WarMode then
return true, "Interface\\TargetingFrame\\UI-PhasingIcon",
-1, -1, -1, nil, nil, 0.15625, 0.84375, 0.15625, 0.84375;
else
return false, nil, -1, -1, -1;
end
end
......
VuhDoBuffWatch.lua
View file @ 0edd8143
......@@ -29,6 +29,26 @@ VUHDO_BUFF_ORDER = { };
local sEmpty = { };
local sCooldownAliases = { };
-- Backdrops
BACKDROP_VUHDO_BUFF_SWATCH_PANEL_8_8_0000 = {
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
tile = true,
tileSize = 8,
edgeSize = 8,
};
BACKDROP_COLOR_VUHDO_BUFF_SWATCH_PANEL = CreateColor(0, 0, 0);
BACKDROP_VUHDO_BUFF_WATCH_MAIN_FRAME_16_16_5555 = {
bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
edgeFile = "Interface\\Tooltips\\UI-Tooltip-Border",
tile = true,
tileSize = 16,
edgeSize = 16,
insets = { left = 5, right = 5, top = 5, bottom = 5 },
};
......
VuhDoBuffWatch.xml
View file @ 0edd8143
......@@ -22,23 +22,14 @@
</Scripts>
</Button>
<Frame name="VuhDoBuffSwatchPanelTemplate" virtual="true">
<Frame name="VuhDoBuffSwatchPanelTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_BUFF_SWATCH_PANEL_8_8_0000" type="global" />
<KeyValue key="backdropColor" value="BACKDROP_COLOR_VUHDO_BUFF_SWATCH_PANEL" type="global" />
</KeyValues>
<Size>
<AbsDimension x="75" y="24" />
</Size>
<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<Color r="0" g="0" b="0" />
<BackgroundInsets>
<AbsInset left="0" right="0" top="0" bottom="0" />
</BackgroundInsets>
<TileSize>
<AbsValue val="8" />
</TileSize>
<EdgeSize>
<AbsValue val="8" />
</EdgeSize>
</Backdrop>
<Frames>
<Button name="$parentGlassButton" setAllPoints="true" inherits="SecureUnitButtonTemplate,SecureHandlerEnterLeaveTemplate,SecureHandlerShowHideTemplate">
......@@ -242,18 +233,10 @@
</Frame>
<Frame name="VuhDoBuffWatchMainFrameTemplate" virtual="true" toplevel="true" frameStrata="MEDIUM"
movable="true" parent="UIParent" enableMouse="true">
<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
<BackgroundInsets>
<AbsInset left="5" right="5" top="5" bottom="5" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
movable="true" parent="UIParent" enableMouse="true" inherit="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_BUFF_WATCH_MAIN_FRAME_16_16_5555" type="global" />
</KeyValues>
<Frames>
<Frame name="$parentInfoLabel" hidden="true" inherits="VuhDoLabelFrameTemplate" >
<Size>
......
VuhDoDebuffConst.lua
View file @ 0edd8143
......@@ -201,6 +201,5 @@ VUHDO_INIT_IGNORE_DEBUFFS_NO_HARM = {
[(GetSpellInfo(57723))] = true, -- Exhaustion
[(GetSpellInfo(80354))] = true, -- Temporal Displacement
[(GetSpellInfo(95809))] = true, -- Insanity
[(GetSpellInfo(12292))] = true, -- Bloodbath
};
VuhDoEventHandler.lua
View file @ 0edd8143
......@@ -442,15 +442,7 @@ function VUHDO_OnEvent(_, anEvent, anArg1, anArg2, anArg3, anArg4, anArg5, anArg
VUHDO_updateBouquetsForEvent(anArg1, 4); -- VUHDO_UPDATE_DEBUFF
end
-- elseif "UNIT_HEALTH" == anEvent then
-- as of patch 7.1 we are seeing empty units on health related events
-- if anArg1 and (VUHDO_RAID or tEmptyRaid)[anArg1] then
-- VUHDO_updateHealth(anArg1, 2); -- VUHDO_UPDATE_HEALTH
-- end
-- TODO: is it ok to listen to both UNIT_HEALTH and UNIT_HEALTH_FREQUENT?
-- TODO: add options based on desired responsiveness and performance
elseif "UNIT_HEALTH_FREQUENT" == anEvent then
elseif "UNIT_HEALTH" == anEvent then
-- as of patch 7.1 we are seeing empty units on health related events
if anArg1 and ((VUHDO_RAID or tEmptyRaid)[anArg1] or VUHDO_isBossUnit(anArg1)) then
VUHDO_updateHealth(anArg1, 2);
......@@ -1091,7 +1083,7 @@ local function VUHDO_updateAllRange()
end
-- Check if unit is phased
if UnitIsWarModePhased(tUnit) or not UnitInPhase(tUnit) then
if UnitPhaseReason(tUnit) then
tIsInRange = false;
else
-- Check if unit is in range
......@@ -1498,7 +1490,7 @@ end
local VUHDO_ALL_EVENTS = {
"VARIABLES_LOADED", "PLAYER_ENTERING_WORLD",
"UNIT_HEALTH_FREQUENT", "UNIT_MAXHEALTH", -- "UNIT_HEALTH",
"UNIT_MAXHEALTH", "UNIT_HEALTH",
"UNIT_AURA",
"UNIT_TARGET",
"GROUP_ROSTER_UPDATE", "INSTANCE_ENCOUNTER_ENGAGE_UNIT", "UPDATE_ACTIVE_BATTLEFIELD",
......
VuhDoGuiToolbox.lua
View file @ 0edd8143
......@@ -346,8 +346,7 @@ local VUHDO_BLIZZ_EVENTS = {
"UNIT_FACTION",
"UNIT_FLAGS",
"UNIT_HEAL_PREDICTION",
-- "UNIT_HEALTH",
"UNIT_HEALTH_FREQUENT",
"UNIT_HEALTH",
"UNIT_LEVEL",
"UNIT_MAXHEALTH",
"UNIT_MAXPOWER",
......@@ -379,8 +378,7 @@ local VUHDO_FIX_EVENTS = {
"UNIT_AURA",
"UNIT_COMBAT",
"UNIT_HEAL_PREDICTION",
-- "UNIT_HEALTH",
"UNIT_HEALTH_FREQUENT",
"UNIT_HEALTH",
"UNIT_MAXHEALTH",
"UNIT_MAXPOWER",
"UNIT_PET",
......
VuhDoOptions/VuhDoLookAndFeel.lua
View file @ 0edd8143
......@@ -34,6 +34,86 @@ local VUHDO_NORMAL_LABEL_COLOR_DISA = {
-- Backdrops
BACKDROP_VUHDO_H_SLIDER_8_8_1111 = {
bgFile = "Interface\\AddOns\\VuhDoOptions\\Images\\blue_lt_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_3",
tile = true,
tileSize = 8,
edgeSize = 8,
insets = { left = 1, right = 1, top = 1, bottom = 1 },
};
BACKDROP_VUHDO_FRAME_16_16_1111 = {
bgFile = "Interface\\AddOns\\VuhDoOptions\\Images\\blue_lt_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_2",
tile = true,
tileSize = 16,
edgeSize = 16,
insets = { left = 1, right = 1, top = 1, bottom = 1 },
};
BACKDROP_VUHDO_PANEL_16_16_3333 = {
bgFile = "Interface\\AddOns\\VuhDo\\Images\\white_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_1",
tile = true,
tileSize = 16,
edgeSize = 16,
insets = { left = 3, right = 3, top = 3, bottom = 3 },
};
BACKDROP_VUHDO_WHITE_PANEL_16_16_3333 = {
bgFile = "Interface\\AddOns\\VuhDo\\Images\\white_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_2",
tile = true,
tileSize = 16,
edgeSize = 16,
insets = { left = 3, right = 3, top = 3, bottom = 3 },
};
BACKDROP_VUHDO_WHITE_SQUARE_16_16_0000 = {
bgFile = "Interface\\AddOns\\VuhDo\\Images\\white_square_16_16",
tile = true,
tileSize = 16,
edgeSize = 16,
};
BACKDROP_VUHDO_PANEL_SCROLL_BAR_8_8_1111 = {
bgFile = "Interface\\AddOns\\VuhDoOptions\\Images\\blue_dk_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_3",
tile = true,
tileSize = 8,
edgeSize = 8,
insets = { left = 1, right = 1, top = 1, bottom = 1 },
};
BACKDROP_VUHDO_SCROLL_PANEL_16_16_0000 = {
bgFile = "Interface\\AddOns\\VuhDo\\Images\\white_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_4",
tile = true,
tileSize = 16,
edgeSize = 16,
};
BACKDROP_VUHDO_SCROLL_PANEL_2_16_16_0000 = {
bgFile = "Interface\\AddOns\\VuhDo\\Images\\white_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_1",
tile = true,
tileSize = 16,
edgeSize = 16,
};
BACKDROP_VUHDO_PANEL_APPEND_BOTTOM_16_16_1111 = {
bgFile = "Interface\\AddOns\\VuhDoOptions\\Images\\blue_lt_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_2_append_bottom",
tile = true,
tileSize = 16,
edgeSize = 16,
insets = { left = 1, right = 1, top = 1, bottom = 1 },
};
--
function VUHDO_lnfCheckButtonOnLoad(aCheckButton)
if aCheckButton:GetText() then
......
VuhDoOptions/VuhDoLookAndFeel.xml
View file @ 0edd8143
......@@ -1255,7 +1255,10 @@
<AbsDimension x="140" y="50" />
</Size>
<Frames>
<Slider name="$parentSlider" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="HORIZONTAL">
<Slider name="$parentSlider" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="HORIZONTAL" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_H_SLIDER_8_8_1111" type="global" />
</KeyValues>
<Size>
<AbsDimension x="128" y="18" />
</Size>
......@@ -1263,17 +1266,6 @@
<Anchor point="LEFT" />
<Anchor point="RIGHT" />
</Anchors>
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_lt_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_3" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="8" />
</TileSize>
<EdgeSize>
<AbsValue val="8" />
</EdgeSize>
</Backdrop>
<Layers>
<Layer>
<FontString name="$parentTitle" inherits="VuDoDefaultFontTemplate" text="">
......@@ -1330,18 +1322,10 @@
<AbsDimension x="18" y="50" />
</Size>
<Frames>
<Slider name="$parentSlider" setallpoints="true" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="VERTICAL">
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_lt_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_3" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="8" />
</TileSize>
<EdgeSize>
<AbsValue val="8" />
</EdgeSize>
</Backdrop>
<Slider name="$parentSlider" setallpoints="true" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="VERTICAL" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_H_SLIDER_8_8_1111" type="global" />
</KeyValues>
<Layers>
<Layer>
<FontString name="$parentTitle" inherits="VuDoDefaultFontTemplate" text="">
......@@ -1393,21 +1377,13 @@
</Frame>
<Frame name="VuhdoComboItemTemplate" virtual="true">
<Frame name="VuhdoComboItemTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_WHITE_SQUARE_16_16_0000" type="global" />
</KeyValues>
<Size>
<AbsDimension x="210" y="16" />
</Size>
<Backdrop bgFile="Interface\AddOns\VuhDo\Images\white_square_16_16" tile="true">
<BackgroundInsets>
<AbsInset left="0" right="0" top="0" bottom="0" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<Frames>
<Frame name="$parentLabel">
<Size>
......@@ -1984,7 +1960,7 @@
</Anchor>
</Anchors>
<ScrollChild>
<Frame name="$parentSelectPanel">
<Frame name="$parentSelectPanel" mixin="BackdropTemplateMixin">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
......@@ -2123,7 +2099,7 @@
</Anchor>
</Anchors>
<ScrollChild>
<Frame name="$parentSelectPanel">
<Frame name="$parentSelectPanel" mixin="BackdropTemplateMixin">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
......@@ -2149,65 +2125,32 @@
</Scripts>
</Button>
<Frame name="VuhDoFrameTemplate" toplevel="true" movable="true" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_lt_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_2" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<Frame name="VuhDoFrameTemplate" toplevel="true" movable="true" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_FRAME_16_16_1111" type="global" />
</KeyValues>
</Frame>
<Frame name="VuhDoPanelTemplate" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDo\Images\white_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_1" tile="true">
<BackgroundInsets>
<AbsInset left="3" right="3" top="3" bottom="3" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<Frame name="VuhDoPanelTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_PANEL_16_16_3333" type="global" />
</KeyValues>
</Frame>
<Frame name="VuhDoWhitePanelTemplate" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDo\Images\white_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_2" tile="true">
<BackgroundInsets>
<AbsInset left="3" right="3" top="3" bottom="3" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<Frame name="VuhDoWhitePanelTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_WHITE_PANEL_16_16_3333" type="global" />
</KeyValues>
</Frame>
<Slider name="VuhDoPanelScrollBarTemplate" virtual="true">
<Slider name="VuhDoPanelScrollBarTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_PANEL_SCROLL_BAR_8_8_1111" type="global" />
</KeyValues>
<Size>
<AbsDimension x="16" y="0"/>
</Size>
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_dk_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_3" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="8" />
</TileSize>
<EdgeSize>
<AbsValue val="8" />
</EdgeSize>
</Backdrop>
<Frames>
<Button name="$parentScrollUpButton" inherits="UIPanelScrollUpButtonTemplate">
<Size>
......@@ -2254,18 +2197,10 @@
</Slider>
<ScrollFrame name="VuhDoScrollPanelTemplate" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDo\Images\white_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_4" tile="true">
<BackgroundInsets>
<AbsInset left="0" right="0" top="0" bottom="0" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<ScrollFrame name="VuhDoScrollPanelTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_SCROLL_PANEL_16_16_0000" type="global" />
</KeyValues>
<Frames>
<Slider name="$parentScrollBar" inherits="VuhDoPanelScrollBarTemplate">
<Anchors>
......@@ -2283,7 +2218,7 @@
</Slider>
</Frames>
<Scripts>
<OnLoad>
<OnLoad inherit="prepend">
ScrollFrame_OnLoad(self);
</OnLoad>
<OnScrollRangeChanged>
......@@ -2312,18 +2247,10 @@
</Scripts>
</ScrollFrame>
<ScrollFrame name="VuhDoScrollPanelTemplate2" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDo\Images\white_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_1" tile="true">
<BackgroundInsets>
<AbsInset left="0" right="0" top="0" bottom="0" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<ScrollFrame name="VuhDoScrollPanelTemplate2" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_SCROLL_PANEL_2_16_16_0000" type="global" />
</KeyValues>
<Frames>
<Slider name="$parentScrollBar" inherits="VuhDoPanelScrollBarTemplate">
<Anchors>
......@@ -2341,7 +2268,7 @@
</Slider>
</Frames>
<Scripts>
<OnLoad>
<OnLoad inherit="prepend">
ScrollFrame_OnLoad(self);
</OnLoad>
<OnScrollRangeChanged>
......@@ -2485,7 +2412,7 @@
</Anchor>
</Anchors>
<ScrollChild>
<Frame name="$parentSelectPanel">
<Frame name="$parentSelectPanel" mixin="BackdropTemplateMixin">
<Anchors>
<Anchor point="TOPLEFT">
<Offset>
......@@ -2512,18 +2439,10 @@
</Button>
<Frame name="VuhDoPanelAppendBottomTemplate" virtual="true">
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_lt_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_2_append_bottom" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="16" />
</TileSize>
<EdgeSize>
<AbsValue val="16" />
</EdgeSize>
</Backdrop>
<Frame name="VuhDoPanelAppendBottomTemplate" virtual="true" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_PANEL_APPEND_BOTTOM_16_16_1111" type="global" />
</KeyValues>
</Frame>
......
VuhDoOptions/VuhDoLookAndFeelStandardShare.lua
View file @ 0edd8143
......@@ -39,13 +39,13 @@ function VUHDO_initBuddyNameModel()
end
-- Friends
local tNumFriends = GetNumFriends();
local tIsOnline;
local tName;
local tNumFriends = C_FriendList.GetNumFriends();
local tFriendInfo;
for tCnt = 1, tNumFriends do
tName, _, _, _, tIsOnline = GetFriendInfo(tCnt);
if (tIsOnline) then
VUHDO_addBuddyNameToComboModel(tName);
tFriendInfo = C_FriendList.GetFriendInfoByIndex(tCnt);
if (tFriendInfo.connected) then
VUHDO_addBuddyNameToComboModel(tFriendInfo.name);
end
end
......@@ -102,4 +102,4 @@ function VUHDO_optionsExecShare(aPanel)
_G[aPanel:GetAttribute("model")[1]](VUHDO_SELECTED_COMBO_BUDDY, tSelection);
return true;
end
\ No newline at end of file
end
VuhDoOptions/VuhDoNewColorPicker.lua
View file @ 0edd8143
......@@ -5,6 +5,16 @@ local sIsTextEdit;
local VUHDO_origColor;
local VUHDO_copyPasteColor = { };
-- Backdrops
BACKDROP_VUHDO_COLOR_PICKER_SLIDER_8_8_1111 = {
bgFile = "Interface\\AddOns\\VuhDoOptions\\Images\\blue_lt_square_16_16",
edgeFile = "Interface\\AddOns\\VuhDoOptions\\Images\\panel_edges_1",
tile = true,
tileSize = 8,
edgeSize = 8,
insets = { left = 1, right = 1, top = 1, bottom = 1 },
};
--
local function VUHDO_mayEditText()
return VUHDO_COLOR.TR ~= nil and not strfind(VUHDO_PROHIBIT, "T", 1, true);
......
VuhDoOptions/VuhDoNewColorPicker.xml
View file @ 0edd8143
......@@ -229,18 +229,10 @@
</Anchor>
</Anchors>
<Frames>
<Slider name="$parentSlider" setallpoints="true" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="VERTICAL">
<Backdrop bgFile="Interface\AddOns\VuhDoOptions\Images\blue_lt_square_16_16" edgeFile="Interface\AddOns\VuhDoOptions\Images\panel_edges_1" tile="true">
<BackgroundInsets>
<AbsInset left="1" right="1" top="1" bottom="1" />
</BackgroundInsets>
<TileSize>
<AbsValue val="8" />
</TileSize>
<EdgeSize>
<AbsValue val="8" />
</EdgeSize>
</Backdrop>
<Slider name="$parentSlider" setallpoints="true" enableMouse="true" minValue="0" maxValue="100" defaultValue="0" valueStep="1" orientation="VERTICAL" inherits="BackdropTemplate" mixin="BackdropTemplateMixin">
<KeyValues>
<KeyValue key="backdropInfo" value="BACKDROP_VUHDO_COLOR_PICKER_SLIDER_8_8_1111" type="global" />
</KeyValues>
<Layers>
<Layer>
<FontString name="$parentTitle" inherits="VuDoDefaultFontTemplate" text="VUHDO_I18N_OPACITY">
......@@ -287,7 +279,7 @@
</Frames>
<Scripts>
<OnLoad>
<OnLoad inherit="prepend">
VUHDO_lnfPatchFont(self, "OldColorLabel");
VUHDO_lnfPatchFont(self, "NewColorLabel");
self:SetScript("OnColorSelect", VUHDO_colorPickerColorSelectCallback);
......
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