wow/reaction: Overlay.lua comparison

comparison Overlay.lua @ 98:a44173c7a82c

- added (Hidden) to label when bar is being shown temporarily for config - added snap-indicator (lock) icon. Displays when not dragging, if anchored, as well. - changed bar color when anchored

author	Flick <flickerstreak@gmail.com>
date	Fri, 24 Oct 2008 18:14:07 +0000
parents	567a885cdfad
children	f200bcb193d6

comparison

equal deleted inserted replaced

-:5d3b7b025142
+:a44173c7a82c
 ReAction:UpdateRevision("$Revision$")
 --
 -- Bar config overlay
 --
+local function GetNormalTextColor()
+return 1.0, 1.0, 1.0, 1.0
+end
+local function GetAnchoredTextColor()
+return 1.0, 1.0, 1.0, 1.0
+end
+local function GetNormalBgColor()
+return 0.7, 0.7, 1.0, 0.3
+end
+local function GetAnchoredBgColor()
+return 0.9, 0.2, 0.7, 0.3
+end
 local function StoreSize(bar)
 local f = bar:GetFrame()
 SetSize( bar, f:GetWidth(), f:GetHeight() )
 end
 RIGHT       = function(x, y) return -x, 0 end,
 TOPRIGHT    = function(x, y) return -x, -y end,
 TOP         = function(x, y) return 0, -y end,
 TOPLEFT     = function(x, y) return x, -y end,
 LEFT        = function(x, y) return x, 0 end,
-CENTER      = function(x, y) return 0, 0 end,
+CENTER      = function(x, y) return x, y end,
 }
 local pointCoordFuncs = {
 BOTTOMLEFT  = function(f) return f:GetLeft(),  f:GetBottom() end,
 BOTTOM      = function(f) return nil,          f:GetBottom() end,
 BOTTOMRIGHT = function(f) return f:GetRight(), f:GetBottom() end,
 end
 local function CreateSnapIndicator()
 local si = CreateFrame("Frame",nil,UIParent)
 si:SetFrameStrata("HIGH")
-si:SetHeight(8)
+si:SetHeight(16)
-si:SetWidth(8)
+si:SetWidth(16)
 local tex = si:CreateTexture()
 tex:SetAllPoints()
-tex:SetTexture(1.0, 0.82, 0, 0.8)
+tex:SetTexture("Interface\\AddOns\\ReAction\\img\\lock")
 tex:SetBlendMode("ADD")
 tex:SetDrawLayer("OVERLAY")
 return si
 end
 if si1:IsVisible() then
 si1:Hide()
 si2:Hide()
 end
 end
+return o, p
 end
 local function HideSnapIndicator()
 if si1:IsVisible() then
 si1:Hide()
 si2:Hide()
+end
+end
+local function UpdateLabelString(bar)
+local label = bar.controlLabelString
+if label then
+local name = bar.labelName
+if name and bar.labelSubtext then
+name = format("%s (%s)", name, bar.labelSubtext)
+end
+label:SetText(name or "")
 end
 end
 local function CreateControls(bar)
 local f = bar:GetFrame()
 local hTex = overlay:CreateTexture(nil,"HIGHLIGHT")
 hTex:SetTexture(0.7,0.7,1.0,0.2)
 hTex:SetPoint("TOPLEFT",4,-4)
 hTex:SetPoint("BOTTOMRIGHT",-4,4)
 hTex:SetBlendMode("ADD")
+local aTex = overlay:CreateTexture(nil,"ARTWORK")
+aTex:SetTexture("Interface\\AddOns\\ReAction\\img\\lock")
+aTex:SetWidth(16)
+aTex:SetHeight(16)
+aTex:Hide()
 -- label
 local label = overlay:CreateFontString(nil,"OVERLAY","GameFontNormalLarge")
 label:SetAllPoints()
 label:SetJustifyH("CENTER")
 label:SetShadowColor(0,0,0,1)
-label:SetShadowOffset(2,-2)
+label:SetShadowOffset(3,-3)
-label:SetTextColor(1,1,1,1)
+label:SetTextColor(GetNormalTextColor())
 label:SetText(bar:GetName())
 label:Show()
 bar.controlLabelString = label  -- so that bar:SetLabel() can update it
+local function UpdateAnchorDecoration()
+local point, anchor, relPoint, x, y = f:GetPoint(1)
+if point then
+local ofsx, ofsy = insidePointOffsetFuncs[point](x,y)
+if (anchor and anchor ~= UIParent) or (ofsx == 0 and ofsy == 0) then
+bgTex:SetTexture( GetAnchoredBgColor() )
+hTex:SetTexture( GetAnchoredBgColor() )
+label:SetTextColor( GetAnchoredTextColor() )
+aTex:ClearAllPoints()
+aTex:SetPoint(point)
+aTex:Show()
+return
+end
+end
+bgTex:SetTexture( GetNormalBgColor() )
+hTex:SetTexture( GetNormalBgColor() )
+label:SetTextColor( GetNormalTextColor() )
+aTex:Hide()
+end
 local function StopResize()
 f:StopMovingOrSizing()
 f.isMoving = false
 f:SetScript("OnUpdate",nil)
 local tex = corner:CreateTexture(nil,"HIGHLIGHT")
 tex:SetTexture(1.0,0.82,0,0.7)
 tex:SetBlendMode("ADD")
 tex:SetAllPoints()
 corner:RegisterForDrag("LeftButton","RightButton")
-local function updateTooltip()
+local function UpdateTooltip()
 local size, size2 = bar:GetButtonSize()
 local rows, cols, spacing = bar:GetButtonGrid()
 size = (size == size2) and tostring(size) or format("%dx%d",size,size2)
 GameTooltipTextRight4:SetText(size)
 GameTooltipTextRight5:SetText(tostring(spacing))
 if btn == "LeftButton" then -- button resize
 f:SetMinResize( (s+12)*c+1, (s+12)*r+1 )
 f:SetScript("OnUpdate",
 function()
 RecomputeButtonSize(bar)
-updateTooltip()
+UpdateTooltip()
 end
 )
 elseif btn == "RightButton" then -- spacing resize
 f:SetMinResize( bw*c, bh*r )
 f:SetScript("OnUpdate",
 function()
 RecomputeButtonSpacing(bar)
-updateTooltip()
+UpdateTooltip()
 end
 )
 end
 f:StartSizing(point)
 end
 function()
 f:StartMoving()
 f.isMoving = true
 local w,h = bar:GetButtonSize()
 f:ClearAllPoints()
+UpdateAnchorDecoration()
 f:SetScript("OnUpdate", function()
 if IsShiftKeyDown() then
-DisplaySnapIndicator(f,w,h)
+local f, p = DisplaySnapIndicator(f,w,h)
 else
 HideSnapIndicator()
 end
 end)
 end
 )
-local function updateDragTooltip()
+local function UpdateDragTooltip()
 GameTooltip:SetOwner(f, "ANCHOR_TOPRIGHT")
 GameTooltip:AddLine(bar.name)
 GameTooltip:AddLine(L["Drag to move"])
 GameTooltip:AddLine(("|cff00ff00%s|r %s"):format(L["Shift-drag"],L["to anchor to nearby frames"]))
 GameTooltip:AddLine(("|cff00cccc%s|r %s"):format(L["Right-click"],L["for options"]))
 HideSnapIndicator()
 end
 StoreExtents(bar)
 ReAction:RefreshOptions()
-updateDragTooltip()
+UpdateDragTooltip()
+UpdateAnchorDecoration()
 end
 )
 overlay:SetScript("OnEnter",
 function()
--- TODO: add bar type and status information to name
+UpdateDragTooltip()
---[[
-local name = bar.name
-for _, m in ReAction:IterateModules() do
-local suffix = safecall(m,"GetBarNameModifier",bar)
-if suffix then
-name = ("%s %s"):format(name,suffix)
-end
-end
-]]--
-updateDragTooltip()
 end
 )
 overlay:SetScript("OnLeave", HideGameTooltip)
 KB.RegisterCallback(overlay,"LIBKEYBOUND_DISABLED")
 if ReAction:GetKeybindMode() then
 overlay:SetFrameLevel(1)
 end
+bar:SetLabel(bar:GetName())
+UpdateLabelString(bar)
+UpdateAnchorDecoration()
 return overlay
 end
 f:Hide()
 end
 end
 function Bar:SetLabel(name)
-local label = self.controlLabelString
+self.labelName = name
-if label then
+UpdateLabelString(self)
-label:SetText(self.name)
+end
-end
-end
+function Bar:SetLabelSubtext(text)
+self.labelSubtext = text
+UpdateLabelString(self)
+end

Mercurial > wow > reaction

comparison Overlay.lua @ 98:a44173c7a82c