WoWInterface SVN WhoFramedWatcherWabbit

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 26 to Rev 27
    ↔ Reverse comparison
  •

Rev 26 → Rev 27

trunk/Who Framed Watcher Wabbit/Who Framed Watcher Wabbit.toc
1,6 → 1,6
## Interface: 60000
## Name: Who Framed Watcher Wabbit?
## Version: 2.1
## Version: 2.1.1
## Notes: Various tweaks to improve the quest watch frame
## SavedVariables: WFWWDB
## SavedVariablesPerCharacter: WFWWPCDB
trunk/Who Framed Watcher Wabbit/wfww.lua
428,7 → 428,7
},
petBattle = {
name = "Collapse in pet battle",
desc = "Automatically collapses the watch frame when entering a pet battle.",
desc = "Collapses the watch frame when entering a pet battle instead it hiding completely.",
type = "toggle",
get = function() return db.petBattle end,
set = function()
436,9 → 436,13
if db.petBattle then
OTFContainer:RegisterEvent("PET_BATTLE_OPENING_START")
OTFContainer:RegisterEvent("PET_BATTLE_CLOSE")
FRAMELOCK_STATES.PETBATTLES.ObjectiveTrackerFrame = "shown"
FRAMELOCK_STATES.PETBATTLES.OTFContainer = "shown"
else
OTFContainer:RegisterEvent("PET_BATTLE_OPENING_START")
OTFContainer:RegisterEvent("PET_BATTLE_CLOSE")
OTFContainer:UnregisterEvent("PET_BATTLE_OPENING_START")
OTFContainer:UnregisterEvent("PET_BATTLE_CLOSE")
FRAMELOCK_STATES.PETBATTLES.ObjectiveTrackerFrame = "hidden"
FRAMELOCK_STATES.PETBATTLES.OTFContainer = "hidden"
end
end,
order = 15.5,
451,12 → 455,14
set = function()
db.scrolling = not db.scrolling
if db.scrolling then
OTFContainerScrollBar:SetAlpha(1)
OTFContainerScrollBar:Show()
OTFContainerScrollBar:SetAlpha(ObjectiveTrackerFrame.collapsed and 0 or 1)
OTFContainer:EnableMouseWheel(true)
OTFContainerBG:SetWidth(297)
OTFContainerBG:SetWidth(ObjectiveTrackerFrame.collapsed and 150 or 297)
ObjectiveTrackerFrame:SetHeight(980 or db.height - 20)
else
OTFContainerBG:SetWidth(280)
OTFContainerBG:SetWidth(ObjectiveTrackerFrame.collapsed and 150 or 280)
OTFContainerScrollBar:Hide()
OTFContainerScrollBar:SetAlpha(0)
OTFContainer:EnableMouseWheel(false)
ObjectiveTrackerFrame:SetHeight(db.height - 20)
553,6 → 559,7
OTFContainerBG:ClearAllPoints()
OTFContainerBG:SetPoint("TOPLEFT", -5, 5)
if db.scrolling then
OTFContainerScrollBar:Show()
OTFContainerScrollBar:SetAlpha(1)
OTFContainer:EnableMouseWheel(true)
OTFContainerBG:SetSize(297, db.height + 13)
577,6 → 584,7
OTFContainerBG:SetPoint("TOPRIGHT", 10, -2)
OTFContainerBG:SetSize(150, 36)
OTFContainerScrollBar:SetAlpha(0)
OTFContainerScrollBar:Hide(0)
OTFContainer:EnableMouseWheel(false)
ObjectiveTracker_MinimizeButton_OnClick() --default function called by OnClick
end
649,10 → 657,24
OTFContainerScrollBar.scrollStep = 35
OTFContainerBG:SetPoint("TOPLEFT", -5, 5)
OTFContainerBG:SetFrameStrata("BACKGROUND")
 
ObjectiveTrackerFrame:SetParent(OTFContainerScrollChild)
ObjectiveTrackerFrame:SetClampedToScreen(false)
ObjectiveTrackerFrame:ClearAllPoints()
ObjectiveTrackerFrame:SetPoint("TOPLEFT", 30, -10)
local cap = ObjectiveTrackerFrame.ClearAllPoints
local sp = ObjectiveTrackerFrame.SetPoint
hooksecurefunc(ObjectiveTrackerFrame, "SetPoint", function(self)
cap(self)
sp(self, "TOPLEFT", 30, -10)
self:SetHeight(db.scrolling and 980 or db.height - 20)
end)
 
if db.scrolling then
OTFContainerBG:SetSize(297, db.height + 13)
else
OTFContainerBG:SetSize(280, db.height + 13)
OTFContainerScrollBar:Hide()
OTFContainerScrollBar:SetAlpha(0)
OTFContainer:EnableMouseWheel(false)
end
710,18 → 732,6
end
hooksecurefunc(SCENARIO_TRACKER_MODULE, "AddObjective", HookForUpdates)
 
ObjectiveTrackerFrame:SetParent(OTFContainerScrollChild)
ObjectiveTrackerFrame:SetClampedToScreen(false)
ObjectiveTrackerFrame:ClearAllPoints()
ObjectiveTrackerFrame:SetPoint("TOPLEFT", 30, -10)
local cap = ObjectiveTrackerFrame.ClearAllPoints
local sp = ObjectiveTrackerFrame.SetPoint
hooksecurefunc(ObjectiveTrackerFrame, "SetPoint", function(self)
cap(self)
sp(self, "TOPLEFT", 30, -10)
self:SetHeight(db.scrolling and 980 or db.height - 20)
end)
 
otfQuests.animateReason = 0
otfAchievements.animateReason = 0
 
829,6 → 839,10
if db.petBattle then
OTFContainer:RegisterEvent("PET_BATTLE_OPENING_START")
OTFContainer:RegisterEvent("PET_BATTLE_CLOSE")
FRAMELOCK_STATES.PETBATTLES.ObjectiveTrackerFrame = "shown"
FRAMELOCK_STATES.PETBATTLES.OTFContainer = "shown"
else
FRAMELOCK_STATES.PETBATTLES.OTFContainer = "hidden"
end
OTFContainer:RegisterEvent("QUEST_AUTOCOMPLETE")
OTFContainer:RegisterEvent("QUEST_WATCH_LIST_CHANGED")