WoWInterface SVN OpenRDX

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/VFL
    from Rev 682 to Rev 680
    ↔ Reverse comparison
  •

Rev 682 → Rev 680

UI/FrameClasses/WindowFraming.lua
11,11 → 11,9
-- None FRAMING
-----------------------------------------------------
 
function VFLUI.Framing.None(self, titleHeight, bkd)
function VFLUI.Framing.None(self, titleHeight)
-------------------------- WINDOW DECOR
 
self.bkd = bkd;
 
local perf, perfText;
if VFLP.IsEnabled() then
perf = VFLUI.AcquireFrame("Frame");
37,11 → 35,7
 
---------------------------- FIXED ELEMENT LAYOUT
if self.SetInsets then
if self.bkd and self.bkd.insets then
self:SetInsets(self.bkd.insets.left or 0, self.bkd.insets.top or 0, self.bkd.insets.right or 0, self.bkd.insets.bottom or 0);
else
self:SetInsets(0, 0, 0, 0);
end
self:SetInsets(0, 0, 0, 0);
else
local clientArea = self:GetClientArea();
clientArea:ClearAllPoints();
50,8 → 44,6
self:SetWidth(dx); self:SetHeight(dy);
end
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
 
----------------------------- LAYOUT OPERATORS
function self:_FrameLayout() end
67,19 → 59,10
perf:SetWidth(tw);
end
end
 
if self.SetInsets then
if self.bkd and self.bkd.insets then
self:SetInsets(self.bkd.insets.left or 0, self.bkd.insets.top or 0, self.bkd.insets.right or 0, self.bkd.insets.bottom or 0);
else
self:SetInsets(0, 0, 0, 0);
end
else
if not self.SetInsets then
local ca = self:GetClientArea();
ca:SetWidth(self:GetWidth()); ca:SetHeight(self:GetHeight());
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
end
 
function self:_FrameDestroy()
89,8 → 72,6
perf:ClearAllPoints();
perf:Destroy(); perf = nil;
end
if self.bkd then self:SetBackdrop(nil); end
self.bkd = nil;
end
 
self:_FrameLayout();
102,10 → 83,7
-----------------------------------------------------
function VFLUI.Framing.Default(self, titleHeight, bkd)
-------------------------- WINDOW DECOR
 
self.bkd = bkd or VFLUI.BlackDialogBackdrop;
 
--self:SetBackdrop(bkd or VFLUI.BlackDialogBackdrop);
self:SetBackdrop(bkd or VFLUI.BlackDialogBackdrop);
 
local titleBar = self:GetTitleBar();
titleBar:SetPoint("TOPLEFT", self, "TOPLEFT", 5, -5);
165,8 → 143,6
self:SetWidth(dx + 10); self:SetHeight(dy + titleHeight + 7);
end
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
 
----------------------------- LAYOUT OPERATORS
function self:_FrameLayout()
193,8 → 169,7
local ca = self:GetClientArea();
ca:SetWidth(tw - 10); ca:SetHeight(self:GetHeight() - titleHeight - 7);
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
self:SetBackdrop(bkd or VFLUI.BlackDialogBackdrop);
end
 
function self:_FrameDestroy()
204,8 → 179,7
perf:ClearAllPoints();
perf:Destroy(); perf = nil;
end
if self.bkd then self:SetBackdrop(nil); end
self.bkd = nil;
self:SetBackdrop(nil);
VFLUI.ReleaseRegion(titleText); titleText = nil;
VFLUI.ReleaseRegion(tx1); tx1 = nil;
VFLUI.ReleaseRegion(tx2); tx2 = nil;
228,10 → 202,9
insets = { left = 0, right = 0, top = 0, bottom = 0 }
};
 
function VFLUI.Framing.Sleek(self, bkd)
function VFLUI.Framing.Sleek(self)
------------------------------------ WINDOW DECOR
 
self.bkd = bkd or plainBackdrop;
self:SetBackdrop(plainBackdrop);
 
local decor = VFLUI.AcquireFrame("Frame");
decor:SetParent(self);
295,11 → 268,7
 
---------------------------- FIXED ELEMENT LAYOUT
if self.SetInsets then
if self.bkd and self.bkd.insets then
self:SetInsets(self.bkd.insets.left or 1, (self.bkd.insets.top or 1) + 13, self.bkd.insets.right or 1, self.bkd.insets.bottom or 1);
else
self:SetInsets(1, 14, 1, 1);
end
self:SetInsets(1, 14, 1, 1);
else
local clientArea = self:GetClientArea();
clientArea:ClearAllPoints();
308,8 → 277,6
self:SetWidth(dx + 2); self:SetHeight(dy + 15);
end
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
 
----------------------------- LAYOUT OPERATORS
function self:_FrameLayout()
338,8 → 305,7
local ca = self:GetClientArea();
ca:SetWidth(tw - 2); ca:SetHeight(self:GetHeight() - 15);
end
 
if self.bkd then self:SetBackdrop(self.bkd); end
--self:SetBackdrop(plainBackdrop);
end
 
function self:_FrameDestroy()