Mercurial > wow > buffalo2
changeset 79:0784b87f9722
- adjust top anchors for OrderHallCommandBar
author | Nenue |
---|---|
date | Sun, 11 Sep 2016 18:46:30 -0400 |
parents | 08951972041a |
children | bb6b532c5d2f |
files | Modules/BuffFrame.lua Veneer.lua Veneer.toc Veneer_Objectives/ObjectiveTracker.lua |
diffstat | 4 files changed, 30 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/Modules/BuffFrame.lua Tue Aug 30 03:32:22 2016 -0400 +++ b/Modules/BuffFrame.lua Sun Sep 11 18:46:30 2016 -0400 @@ -18,10 +18,10 @@ local BUFF_PROGRESS_SIZE = 4 local BUFF_PROGRESS_INSET = 1 local BUFF_BUTTON_ZOOM = .15 -local BORDER_SIZE_L = 0 -local BORDER_SIZE_R = 0 -local BORDER_SIZE_U = 4 -local BORDER_SIZE_D = 0 +local BORDER_SIZE_L = 1 +local BORDER_SIZE_R = 1 +local BORDER_SIZE_U = 1 +local BORDER_SIZE_D = 1 local BUFF_FRAMES_X = -230 local BUFF_FRAMES_Y = -4 @@ -77,8 +77,8 @@ local id = frame:GetID() - veneer.progress:SetPoint('BOTTOMLEFT', veneer, 'BOTTOMLEFT', 0, -6) - veneer.progress:SetPoint('TOPRIGHT', veneer, 'BOTTOMRIGHT', 0, -1) + veneer.progress:SetPoint('BOTTOMLEFT', veneer, 'BOTTOMLEFT', -1, -7) + veneer.progress:SetPoint('TOPRIGHT', veneer, 'BOTTOMRIGHT', 1, -2) veneer.progress:SetHeight(BUFF_PROGRESS_SIZE + (BUFF_PROGRESS_INSET * 2)) veneer.progress.bg:SetColorTexture(0,0,0,1) @@ -98,7 +98,7 @@ veneer.underlay:SetParent(UIParent) veneer.underlay:SetFrameStrata('BACKGROUND') - veneer.border:SetColorTexture(0,0,0,0) + veneer.border:SetColorTexture(0,0,0,1) veneer.border:SetPoint('TOPLEFT', veneer, 'TOPLEFT', -BORDER_SIZE_L, BORDER_SIZE_U) veneer.border:SetPoint('BOTTOMRIGHT', veneer, 'BOTTOMRIGHT', BORDER_SIZE_R, -BORDER_SIZE_D) veneer.border:Show() @@ -139,8 +139,11 @@ frame:Hide() print('|cFF0088FFborder:SetVertexColor|r', r,g,b,a) veneer.progress.fg:SetColorTexture(r,g,b,a) + veneer.border:Show() end) + + local color = DebuffTypeColor["none"] if aurasCache[frame] and aurasCache[frame][5] then color = DebuffTypeColor[aurasCache[frame][5]] @@ -148,6 +151,10 @@ veneer.progress.fg:SetColorTexture(color.r,color.g,color.b) veneer.border:SetColorTexture(0,0,0,1) + veneer.border:Show() + else + veneer.border:SetColorTexture(0,0,0,1) + veneer.border:Show() end if duration then duration:ClearAllPoints() @@ -222,13 +229,6 @@ SkinFrame(frame:GetName()) end - if frame.filter == 'HARMFUL' then - - veneer.border:Show() - else - veneer.border:Hide() - end - if expires and duration then if duration ~= 0 then
--- a/Veneer.lua Tue Aug 30 03:32:22 2016 -0400 +++ b/Veneer.lua Sun Sep 11 18:46:30 2016 -0400 @@ -17,13 +17,22 @@ local configMode local veneers = {} -do - local anonID = 0 - local AnonymousName = function() +local anonID = 0 + +local tostring = tostring +local IsFrameHandle = IsFrameHandle +local GetAnonymousName = function(key) + if not key then anonID = anonID + 1 - return 'VN' .. anonID + key = anonID end + return 'VN' .. key end +local GetTableName = function(table) + return (IsFrameHandle(table) and table:GetName()) or tostring(table) +end + + local anchor_coefficients = { ['TOP'] = function(x, y) return x, y end, @@ -135,12 +144,11 @@ return end - if veneers[frame] then return veneers[frame] end - local name = (frame:GetName() or AnonymousName())..'Veneer' + local name = type(frame) == 'table' and GetTableName(frame) or GetAnonymousName() local veneer = CreateFrame('Frame', name, frame, template or 'VeneerTemplate') print('+veneer', name)
--- a/Veneer.toc Tue Aug 30 03:32:22 2016 -0400 +++ b/Veneer.toc Sun Sep 11 18:46:30 2016 -0400 @@ -11,6 +11,4 @@ Veneer.xml Options.lua -Modules\BuffFrame.lua -Modules\PaperDoll.lua -Modules\ObjectiveTracker.lua \ No newline at end of file +Modules\BuffFrame.lua \ No newline at end of file
--- a/Veneer_Objectives/ObjectiveTracker.lua Tue Aug 30 03:32:22 2016 -0400 +++ b/Veneer_Objectives/ObjectiveTracker.lua Sun Sep 11 18:46:30 2016 -0400 @@ -1,5 +1,5 @@ -- Veneer --- ObjectiveTracker.lua +-- Veneer_WorldQuests.lua -- Created: 8/16/2016 8:19 AM -- %file-revision% -- This is more or less a copy of the blizzard code with some customization stuff added