From e21cdeec6d8303e99168fbc57389499fe64f1e3a Mon Sep 17 00:00:00 2001 From: ggargani Date: Tue, 4 Oct 2016 15:37:07 +0200 Subject: [PATCH] Feature: Switch to bigscreen can bow be canceled --- GarrisonCommander.lua | 14 +++++++++++--- RelNotes.lua | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua index e3455c8..79cea13 100644 --- a/GarrisonCommander.lua +++ b/GarrisonCommander.lua @@ -61,7 +61,7 @@ local function tcopy(obj, seen) for k, v in pairs(obj) do res[tcopy(k, s)] = tcopy(v, s) end return res end - +local widgetsForKey={} local parties local missionCompleteOrder=122514 @@ -591,8 +591,16 @@ function addon:ApplyBIGSCREEN(value) end self:Popup(L["Must reload interface to apply"],0, function(this) + pp("BIGSCREEN",value,this) + print("BIGSCREEN",value,this) addon:SetBoolean("BIGSCREEN",value) ReloadUI() + end, + function(this) + pp("BIGSCREEN",value,this) + print("BIGSCREEN",value,this) + addon:SetBoolean("BIGSCREEN",not value) + widgetsForKey['BIGSCREEN']:SetValue(not value) end ) end @@ -1165,12 +1173,12 @@ function addon:Toggle(button) button:SetChecked(f:IsShown()) end end - function addon:CreateOptionsLayer(...) local o=AceGUI:Create("SimpleGroup") -- a transparent frame o:SetLayout("Flow") o:SetCallback("OnClose",function(widget) widget:Release() end) local totsize=0 + wipe(widgetsForKey) for i=1,select('#',...) do totsize=totsize+self:AddOptionToOptionsLayer(o,select(i,...)) end @@ -1235,6 +1243,7 @@ function addon:AddOptionToOptionsLayer(o,flag,maxsize) GameTooltip:FadeOut() end) o:AddChildren(widget) + widgetsForKey[flag]=widget end return maxsize end @@ -2923,7 +2932,6 @@ function addon:AddStandardDataToButton(source,button,mission,missionID,bigscreen end function addon:AddLevel(source,button,mission,missionID,bigscreen) - print("base") button.Level:SetPoint("CENTER", button, "TOPLEFT", 40, -36); local level= (mission.level == GARRISON_FOLLOWER_MAX_LEVEL and mission.iLevel > 0) and mission.iLevel or mission.level local quality=1 diff --git a/RelNotes.lua b/RelNotes.lua index 3b031b4..b0aea2e 100644 --- a/RelNotes.lua +++ b/RelNotes.lua @@ -22,11 +22,12 @@ self:Wiki([[ == Silent mode == typing /gac silent in chat will eliminate every chat messag from GarrisonCommander ]]) -self:RelNotes(2,15,0,[[ +self:RelNotes(2,15,'0-beta1',[[ Feature: Right clicking minimap Icon opens Garrison Report Fix: Troops should now be used more wisely in Class Hall Missions Fix: Should not raise errors when clicking on followers Fix: No longer showing "Install an auction addon" even with auction addon installed +Feature: Switch to bigscreen can bow be canceled ]]) end -- 1.7.9.5