Skip to content

Commit

Permalink
[Release] Version 3.61
Browse files Browse the repository at this point in the history 
* Fixed an issue with the Shift+Click manual quest complete Dewdrop menu
popup
appearing off screen when a players Worldmap is in "Full Screen" mode.
* Re-added the Questie QuestTracker background and added the ability to
set
it's alpha level. This is NOT enabled by default. Pay attention! :)
Step 1: Enable the back ground by running '/questie background' -
default
level is 4. If you're happy with that then you're done. If you want it
lighter or darker then proceed to step 2.
Step 2: Run the set alpha command '/questie backgroundalpha #' Enter a
number between 1 and 9. 1 is super light almost non-exsistant and 9 is
the darkest you can go. So for example: '/questie backgroundalpha 9'
Your UI will automatically reload after step 1 or when you change the
setting in step 2. Can't get around the ReloadUI().
* The Questie QuestTrackers background is a fixed width. I did not
re-enable the
code to auto resize the width. It's set to 200px wide which can
accomodate
some fairly wide quest descriptions and objectives without it looking
too ugly.
* Minor improvement in completed quest markers not dissappearing right
away after
completing a quest.
  • Loading branch information
@Dyaxler
Dyaxler committed Jan 10, 2017
1 parent 51ac8ac commit 3a3bcc7
Show file tree
Hide file tree
Showing 6 changed files with 242 additions and 56 deletions.
4 changes: 2 additions & 2 deletions !Questie/!Questie.toc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## Interface: 11200
## Title: |cFFFFFFFFQuestie|r|cFF00FF00 v3.6|r
## Title: |cFFFFFFFFQuestie|r|cFF00FF00 v3.61|r
## Author: Aero/Schaka/Logonz/Dyaxler/everyone else
## Notes: A standalone Vanilla QuestHelper
## Version: 3.6
## Version: 3.61
## RequiredDeps:
## OptionalDeps: Cartographer, MetaMap, EQL3, ShaguQuest
## SavedVariables:
Expand Down
21 changes: 21 additions & 0 deletions !Questie/ChangeLog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
-------------------------------------------------------------------------------------------------------------------------------
v3.61

* Fixed an issue with the Shift+Click manual quest complete Dewdrop menu popup
appearing off screen when a players Worldmap is in "Full Screen" mode.
* Re-added the Questie QuestTracker background and added the ability to set
it's alpha level. This is NOT enabled by default. Pay attention! :)
Step 1: Enable the back ground by running '/questie background' - default
level is 4. If you're happy with that then you're done. If you want it
lighter or darker then proceed to step 2.
Step 2: Run the set alpha command '/questie backgroundalpha #' Enter a
number between 1 and 9. 1 is super light almost non-exsistant and 9 is
the darkest you can go. So for example: '/questie backgroundalpha 9'
Your UI will automatically reload after step 1 or when you change the
setting in step 2. Can't get around the ReloadUI().
* The Questie QuestTrackers background is a fixed width. I did not re-enable the
code to auto resize the width. It's set to 200px wide which can accomodate
some fairly wide quest descriptions and objectives without it looking too ugly.
* Minor improvement in completed quest markers not dissappearing right away after
completing a quest.

-------------------------------------------------------------------------------------------------------------------------------
v3.6

Expand Down
143 changes: 110 additions & 33 deletions !Questie/Modules/QuestieNotes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,42 +549,119 @@ function Questie_AvailableQuestClick()
local closeFunc = function()
Dewdrop:Close()
end
Dewdrop:Register(WorldMapFrame,
'children', function()
for i, quest in pairs(this.quests) do
local hash = quest.questHash
local questName = "["..QuestieHashMap[hash].questLevel.."] "..QuestieHashMap[hash]['name']
local finishFunc = function(quest)
finishQuest(quest)
Dewdrop:Close()
if (IsAddOnLoaded("Cartographer")) or (IsAddOnLoaded("MetaMap")) or (QuestieConfig.resizeWorldmap == true) then
Dewdrop:Register(WorldMapFrame,
'children', function()
for i, quest in pairs(this.quests) do
local hash = quest.questHash
local questName = "["..QuestieHashMap[hash].questLevel.."] "..QuestieHashMap[hash]['name']
local finishFunc = function(quest)
finishQuest(quest)
Dewdrop:Close()
end
Dewdrop:AddLine(
'text', questName,
'notClickable', quest.icontype ~= "available",
'icon', QuestieIcons[quest.icontype].path,
'iconCoordLeft', 0,
'iconCoordRight', 1,
'iconCoordTop', 0,
'iconCoordBottom', 1,
'func', finishFunc,
'arg1', quest
)
end
Dewdrop:AddLine(
'text', questName,
'notClickable', quest.icontype ~= "available",
'icon', QuestieIcons[quest.icontype].path,
'iconCoordLeft', 0,
'iconCoordRight', 1,
'iconCoordTop', 0,
'iconCoordBottom', 1,
'func', finishFunc,
'arg1', quest
'text', "",
'notClickable', true
)
end
Dewdrop:AddLine(
'text', "",
'notClickable', true
)
Dewdrop:AddLine(
'text', "Cancel",
'func', closeFunc
)
end,
'dontHook', true,
'cursorX', true,
'cursorY', true
)
Dewdrop:Open(WorldMapFrame)
Dewdrop:Unregister(WorldMapFrame)
Dewdrop:AddLine(
'text', "Cancel",
'func', closeFunc
)
end,
'dontHook', true,
'cursorX', true,
'cursorY', true
)
Dewdrop:Open(WorldMapFrame)
Dewdrop:Unregister(WorldMapFrame)
elseif (not IsAddOnLoaded("Cartographer")) or (not IsAddOnLoaded("MetaMap")) and (QuestieConfig.resizeWorldmap == false) then
Dewdrop:Register(this,
'children', function()
for i, quest in pairs(this.quests) do
local hash = quest.questHash
local questName = "["..QuestieHashMap[hash].questLevel.."] "..QuestieHashMap[hash]['name']
local finishFunc = function(quest)
finishQuest(quest)
Dewdrop:Close()
end
Dewdrop:AddLine(
'text', questName,
'notClickable', quest.icontype ~= "available",
'icon', QuestieIcons[quest.icontype].path,
'iconCoordLeft', 0,
'iconCoordRight', 1,
'iconCoordTop', 0,
'iconCoordBottom', 1,
'func', finishFunc,
'arg1', quest
)
end
Dewdrop:AddLine(
'text', "",
'notClickable', true
)
Dewdrop:AddLine(
'text', "Cancel",
'func', closeFunc
)
end,
'dontHook', true,
'point', "TOPLEFT",
'relativePoint', "BOTTOMRIGHT"
)
Dewdrop:Open(this)
Dewdrop:Unregister(this)
end
if (IsAddOnLoaded("Cartographer")) and (CartographerDB["disabledModules"]["Default"]["Look 'n' Feel"] == true) then
Dewdrop:Register(this,
'children', function()
for i, quest in pairs(this.quests) do
local hash = quest.questHash
local questName = "["..QuestieHashMap[hash].questLevel.."] "..QuestieHashMap[hash]['name']
local finishFunc = function(quest)
finishQuest(quest)
Dewdrop:Close()
end
Dewdrop:AddLine(
'text', questName,
'notClickable', quest.icontype ~= "available",
'icon', QuestieIcons[quest.icontype].path,
'iconCoordLeft', 0,
'iconCoordRight', 1,
'iconCoordTop', 0,
'iconCoordBottom', 1,
'func', finishFunc,
'arg1', quest
)
end
Dewdrop:AddLine(
'text', "",
'notClickable', true
)
Dewdrop:AddLine(
'text', "Cancel",
'func', closeFunc
)
end,
'dontHook', true,
'point', "TOPLEFT",
'relativePoint', "BOTTOMRIGHT"
)
Dewdrop:Open(this)
Dewdrop:Unregister(this)
end
end
end
end
Expand Down
72 changes: 58 additions & 14 deletions !Questie/Modules/QuestieTracker.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,61 @@ local QGet_QuestLogTitle = GetQuestLogTitle;
local QGet_NumQuestLeaderBoards = GetNumQuestLeaderBoards;
local QGet_QuestLogLeaderBoard = GetQuestLogLeaderBoard;
---------------------------------------------------------------------------------------------------
-- Calculates QuestieTracker Height
---------------------------------------------------------------------------------------------------
function QuestieTracker:updateTrackingFrameSize()
if (QuestieConfig.trackerBackground == true) then
if (QuestieTracker.highestIndex) == 0 then
QuestieTracker.frame:SetHeight(0.1)
QuestieTracker.frame:SetWidth(0.1)
QuestieTracker.frame.texture:SetAlpha(0.0);
QuestieTracker.frame:Hide()
return
end
if (QuestieConfig.trackerList == true) then
local lastButton = QuestieTracker.questButtons[QuestieTracker.highestIndex];
if lastButton == nil then return; end
local lastbuttonTop = lastButton:GetTop();
local trackerBottom = QuestieTracker.frame:GetBottom();

-- what if nothing is tracked?
if trackerBottom == nil then trackerBottom = 0; end
if lastbuttonTop == nil then lastbuttonTop = 0; end

-- dynamically set the size of the tracker
local totalHeight = lastbuttonTop - trackerBottom;

if (QuestieConfig.showTrackerHeader == true) then
QuestieTracker.frame:SetHeight(totalHeight + 10);
elseif (QuestieConfig.showTrackerHeader == false) then
QuestieTracker.frame:SetHeight(totalHeight + 10);
end
QuestieTracker.frame:SetWidth(200);
QuestieTracker.frame.texture:SetAlpha(QuestieConfig.trackerAlpha);
elseif (QuestieConfig.trackerList == false) then
local lastButton = QuestieTracker.questButtons[QuestieTracker.highestIndex];
if lastButton == nil then return; end
local lastbuttonBottom = lastButton:GetBottom();
local trackerTop = QuestieTracker.frame:GetTop();

-- what if nothing is tracked?
if trackerTop == nil then trackerTop = 0; end
if lastbuttonBottom == nil then lastbuttonBottom = 0; end

-- dynamically set the size of the tracker
local totalHeight = trackerTop - lastbuttonBottom;

if (QuestieConfig.showTrackerHeader == true) then
QuestieTracker.frame:SetHeight(totalHeight + 10);
elseif (QuestieConfig.showTrackerHeader == false) then
QuestieTracker.frame:SetHeight(totalHeight + 10);
end
QuestieTracker.frame:SetWidth(200);
QuestieTracker.frame.texture:SetAlpha(QuestieConfig.trackerAlpha);
end
end
end
---------------------------------------------------------------------------------------------------
-- Color quest objective scheme for quest tracker color option 2
---------------------------------------------------------------------------------------------------
function QuestieTracker:getRGBForObjectiveBold(objective)
Expand Down Expand Up @@ -161,12 +216,6 @@ function QuestieTracker:createOrGetTrackingButton(index)
end);
btn.dragstartx = 0;
btn.dragstarty = 0;
btn:SetScript("OnEnter", function()
QuestieTracker.frame.texture:SetAlpha(0.3);
end);
btn:SetScript("OnLeave", function()
QuestieTracker.frame.texture:SetAlpha(0.0);
end);
btn:RegisterForClicks("RightButtonDown","LeftButtonUp", "LeftClick");
btn.click = function()
if (QuestieConfig.arrowEnabled == true) then
Expand Down Expand Up @@ -480,6 +529,7 @@ function QuestieTracker:fillTrackingFrame()
d:Hide();
index = index + 1;
end
QuestieTracker:updateTrackingFrameSize()
if (QuestieConfig.trackerEnabled == true) then
QuestieTracker.frame:Show();
else
Expand Down Expand Up @@ -555,6 +605,7 @@ function QuestieTracker:fillTrackingFrame()
d:Hide();
index = index + 1;
end
QuestieTracker:updateTrackingFrameSize()
if (QuestieConfig.trackerEnabled == true) then
QuestieTracker.frame:Show();
else
Expand Down Expand Up @@ -583,12 +634,6 @@ function QuestieTracker:createTrackingFrame()
QuestieTracker.frame.texture:SetTexture(0,0,0); -- black
QuestieTracker.frame.texture:SetAlpha(0.0);
QuestieTracker.frame.texture:SetAllPoints(QuestieTracker.frame);
if (QuestieConfig.trackerEnabled == true) then
QuestieTracker.frame:Show();
else
QuestieTracker:Hide()
QuestieTracker.frame:Hide()
end
QuestieTracker.frame:EnableMouse(true);
QuestieTracker.frame:SetMovable(true);
--Fix submitted by wardz - thank you!
Expand Down Expand Up @@ -922,8 +967,7 @@ function QuestieTracker:removeQuestFromTracker(hash)
Questie:RedrawNotes()
if (QuestieTracker.highestIndex) == 0 then
QuestieTrackerHeader:Hide()
QuestieTracker.frame:SetHeight(1)
QuestieTracker.frame:SetWidth(1)
QuestieTracker.frame:Hide()
end
end
---------------------------------------------------------------------------------------------------
Expand Down

0 comments on commit 3a3bcc7

Please sign in to comment.