# HG changeset patch # User Flick # Date 1303757022 25200 # Node ID c918ff9ac7877741dd7a4efe3d0b391e36afda60 # Parent 5ab04f393b0b23469440745141dc80790d9e5d05 Add option to make buttons activate on mouse/key down diff -r 5ab04f393b0b -r c918ff9ac787 ActionButton.lua --- a/ActionButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/ActionButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -230,9 +230,7 @@ f:SetScript("OnReceiveDrag", function(frame) self:OnReceiveDrag() end) -- event registration - f:EnableMouse(true) f:RegisterForDrag("LeftButton", "RightButton") - f:RegisterForClicks("AnyUp") for _, evt in pairs(eventList) do f:RegisterEvent(evt) end diff -r 5ab04f393b0b -r c918ff9ac787 BagButton.lua --- a/BagButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/BagButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -80,8 +80,6 @@ -- (none) -- event registration - f:EnableMouse(true) - f:RegisterForClicks("LeftButtonUp","RightButtonUp") f:RegisterEvent("UPDATE_BINDINGS") -- frame setup diff -r 5ab04f393b0b -r c918ff9ac787 Button.lua --- a/Button.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/Button.lua Mon Apr 25 11:43:42 2011 -0700 @@ -85,6 +85,10 @@ return format("%s:%s", bar:GetName(), idx) end + -- mouse and clicking + -- set click handlers in subclasses + f:EnableMouse(true) + f:RegisterForClicks( bar:GetConfig().clickDown and "AnyDown" or "AnyUp" ) local clickBinding = format("CLICK %s:LeftButton", name) function f:GetHotkey() return LKB:ToShortKey(GetBindingKey(clickBinding)) diff -r 5ab04f393b0b -r c918ff9ac787 Editor.lua --- a/Editor.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/Editor.lua Mon Apr 25 11:43:42 2011 -0700 @@ -255,10 +255,19 @@ func = function() ReAction:EraseBar(bar) end, order = 2 }, + clickDown = { + type = "toggle", + name = L["Activate on Down"], + desc = L["Activate the button when the key or mouse button is pressed down instead of when it is released"], + order = 3, + set = function(info, value) bar:GetConfig().clickDown = value end, + get = function() return bar:GetConfig().clickDown end, + }, anchor = { type = "group", name = L["Anchor"], inline = true, + order = 4, args = { frame = { type = "input", @@ -321,7 +330,6 @@ order = 5 }, }, - order = 3 }, alpha = { type = "range", diff -r 5ab04f393b0b -r c918ff9ac787 MultiCastButton.lua --- a/MultiCastButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/MultiCastButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -395,8 +395,6 @@ barFrame:WrapScript(f, "OnEnter", _onEnter) -- event registration - f:EnableMouse(true) - f:RegisterForClicks("AnyUp") for _, evt in pairs(eventList) do f:RegisterEvent(evt) end @@ -734,7 +732,8 @@ b.icon:Show() b:SetHighlightTexture("Interface\\Buttons\\ButtonHilight-Square") b:GetHighlightTexture():SetBlendMode("ADD") - b:RegisterForClicks("AnyUp") + b:EnableMouse(true) + b:RegisterForClicks(bar:GetConfig().clickDown and "AnyDown" or "AnyUp") b:SetScript("OnShow",UpdateFlyoutIcon) b:SetScript("OnEnter",ShowFlyoutTooltip) b:SetScript("OnLeave",HideFlyoutTooltip) diff -r 5ab04f393b0b -r c918ff9ac787 PetActionButton.lua --- a/PetActionButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/PetActionButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -140,9 +140,7 @@ barFrame:WrapScript(f, "OnReceiveDrag", _onReceiveDrag) -- event registration - f:EnableMouse(true) f:RegisterForDrag("LeftButton", "RightButton") - f:RegisterForClicks("AnyUp") for _, evt in pairs(eventList) do f:RegisterEvent(evt) end diff -r 5ab04f393b0b -r c918ff9ac787 StanceButton.lua --- a/StanceButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/StanceButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -77,8 +77,6 @@ -- (none) -- event registration - f:EnableMouse(true) - f:RegisterForClicks("AnyUp") for _, evt in pairs(eventList) do f:RegisterEvent(evt) end diff -r 5ab04f393b0b -r c918ff9ac787 VehicleExitButton.lua --- a/VehicleExitButton.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/VehicleExitButton.lua Mon Apr 25 11:43:42 2011 -0700 @@ -48,8 +48,6 @@ f:SetScript("OnEvent", function(frame, evt, ...) self:OnEvent(evt,...) end) -- event registration - f:EnableMouse(true) - f:RegisterForClicks("AnyUp") f:RegisterEvent("UPDATE_BINDINGS") -- attach to skinner diff -r 5ab04f393b0b -r c918ff9ac787 locale/enUS.lua --- a/locale/enUS.lua Mon Apr 04 13:04:11 2011 -0700 +++ b/locale/enUS.lua Mon Apr 25 11:43:42 2011 -0700 @@ -68,6 +68,8 @@ "General", "Rename Bar", "Delete Bar", +"Activate on Down", +"Activate the button when the key or mouse button is pressed down instead of when it is released", "Anchor", "Frame", "The frame that the bar is anchored to",