@@ -35,6 +35,15 @@ frame:SetScript("OnShow", function() end) + local bindwheel = tekcheck.new(frame, nil, "Bind mousewheel", "TOPLEFT", showunit, "BOTTOMLEFT", 0, -GAP) + bindwheel.tiptext = "Bind to mousewheel when out of combat and needs are present." + bindwheel:SetScript("OnClick", function(self) + checksound(self) + Cork.db.bindwheel = not Cork.db.bindwheel + Cork.UpdateMouseBinding() + end) + + local tooltiplimit, tooltiplimittext, ttlcontainer = LibStub("tekKonfig-Slider").new(frame, "Tooltip Limit: " .. Cork.dbpc.tooltiplimit, 0, 40, "TOP", showanchor, "TOP") ttlcontainer:SetPoint("LEFT", frame, "CENTER", GAP*5/2, 0) tooltiplimit.tiptext = "The number of units to show in the Cork tooltip." @@ -58,7 +67,7 @@ frame:SetScript("OnShow", function() end) --~ castonpets = tekcheck.new(frame, nil, "Cast on group pets", "TOPLEFT", groupthreshcont, "BOTTOMLEFT", -GAP*2, 0) - castonpets = tekcheck.new(frame, nil, "Cast on group pets", "TOPLEFT", showunit, "BOTTOMLEFT", 0, -GAP) + castonpets = tekcheck.new(frame, nil, "Cast on group pets", "TOPLEFT", bindwheel, "BOTTOMLEFT", 0, -GAP) castonpets.tiptext = "Pets need buffs too! When disabled you can still cast on a pet by targetting it directly." castonpets:SetScript("OnClick", function(self) checksound(self) @@ -68,7 +77,7 @@ frame:SetScript("OnShow", function() end - local group = LibStub("tekKonfig-Group").new(frame, "Modules", "TOP", castonpets or showunit, "BOTTOM", 0, -27) + local group = LibStub("tekKonfig-Group").new(frame, "Modules", "TOP", castonpets or bindwheel, "BOTTOM", 0, -27) group:SetPoint("LEFT", EDGEGAP, 0) group:SetPoint("BOTTOMRIGHT", -EDGEGAP, EDGEGAP) @@ -121,6 +130,7 @@ frame:SetScript("OnShow", function() local function Update(self) showanchor:SetChecked(Cork.db.showanchor) showunit:SetChecked(Cork.db.showunit) + bindwheel:SetChecked(Cork.db.bindwheel) if castonpets then castonpets:SetChecked(Cork.dbpc.castonpets) end if groupthresh then groupthresh:SetValue(Cork.dbpc.multithreshold) end for i,row in pairs(rows) do Config.lua @@ -3,7 +3,7 @@ local ldb, ae = LibStub:GetLibrary("LibDataBroker-1.1"), LibStub("AceEvent-3.0") Cork = {petmappings = {player = "pet"}, defaultspc = {castonpets = false, multithreshold = 2, tooltiplimit = 10}, corks = {}, petunits = {pet = true}, keyblist = {CorkIt = true, type = true, Scan = true, Init = true, configframe = true}} local corks = Cork.corks -local defaults = {point = "TOP", x = 0, y = -100, showanchor = true, showunit = false} +local defaults = {point = "TOP", x = 0, y = -100, showanchor = true, showunit = false, bindwheel = false} local tooltip, anchor for i=1,4 do Cork.petmappings["party"..i], Cork.petunits["partypet"..i] = "partypet"..i, true end Cork.lua @@ -1,49 +1,26 @@ -- Dynamic mousewheel binding module, originally created by Adirelle <gperreal@free.fr> -local CORKNAME = "Mousewheel Bindings" - -local dataobj = LibStub('LibDataBroker-1.1'):NewDataObject("Cork "..CORKNAME, {type='cork'}) -local frame -local keys = { 'MOUSEWHEELUP', 'MOUSEWHEELDOWN' } - ------------------------------------------------------------------------------- --- Binding update ------------------------------------------------------------------------------- - local function ClearBindings() if InCombatLockdown() then return end - ClearOverrideBindings(frame) + ClearOverrideBindings(CorkFrame) end -local function UpdateBindings() +function Cork:UpdateMouseBinding(event, unit) if InCombatLockdown() then return end - if Cork.dbpc[CORKNAME.."-enabled"] and Corkboard:IsVisible() and not IsStealthed() and not IsFlying() and not IsMounted() then - for i,key in ipairs(keys) do - SetOverrideBindingClick(frame, true, key, 'CorkFrame') - end + if Cork.db.bindwheel and (event ~= "PLAYER_REGEN_DISABLED") and Corkboard:IsVisible() then + SetOverrideBindingClick(CorkFrame, true, 'MOUSEWHEELUP', 'CorkFrame') + SetOverrideBindingClick(CorkFrame, true, 'MOUSEWHEELDOWN', 'CorkFrame') else - ClearBindings() + ClearOverrideBindings(CorkFrame) end end ------------------------------------------------------------------------------- --- Addon setup ------------------------------------------------------------------------------- -function dataobj:Init() - Cork.defaultspc[CORKNAME..'-enabled'] = true - - frame = CreateFrame('Frame', 'CorkWheelFrame', Corkboard) - frame:SetAllPoints(Corkboard) - frame:SetScript('OnShow', UpdateBindings) - frame:SetScript('OnHide', ClearBindings) - frame:Show() - - local AE = LibStub('AceEvent-3.0') - AE.RegisterEvent(self, 'PLAYER_AURAS_CHANGED', UpdateBindings) - AE.RegisterEvent(self, 'PLAYER_REGEN_ENABLED', UpdateBindings) - AE.RegisterEvent(self, 'PLAYER_REGEN_DISABLED', ClearBindings) -end +local frame = CreateFrame('Frame', nil, Corkboard) +frame:SetScript('OnShow', Cork.UpdateMouseBinding) +frame:SetScript('OnHide', ClearBindings) -dataobj.Scan = UpdateBindings +frame:SetScript("OnEvent", Cork.UpdateMouseBinding) +frame:RegisterEvent('PLAYER_REGEN_ENABLED') +frame:RegisterEvent('PLAYER_REGEN_DISABLED') Mousewheel.lua 6fd4c085ccaacb6f8bb6765f8a873babd8e46849 Tekkub tekkub@gmail.com http://github.com/tekkub/cork/commit/7cecf3e3753e6515086c201af9034d957e244269 7cecf3e3753e6515086c201af9034d957e244269 2008-09-15T00:40:12-07:00 2008-09-15T00:40:12-07:00 Simplify mousewheel binding 2288cc646bc398c2c5a1a8e51fa129c75125863b Tekkub tekkub@gmail.com