Mercurial > wow > askmrrobot

comparison CombatLog.lua @ 61:cf2b6b9a8337 v23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6.2 update, shopping list bug fixes, ui scale option
author yellowfive
date Tue, 23 Jun 2015 00:27:21 -0700
parents 01b63b8ed811
children e638168c3395
comparison
equal deleted inserted replaced
60:017c05f42fd4 61:cf2b6b9a8337
52 52
53 local chkLfr = createDifficultyCheckBox(instanceId, Amr.Difficulties.Lfr) 53 local chkLfr = createDifficultyCheckBox(instanceId, Amr.Difficulties.Lfr)
54 chkLfr:SetPoint("TOPLEFT", line.frame, "BOTTOMLEFT", w + 20, -30) 54 chkLfr:SetPoint("TOPLEFT", line.frame, "BOTTOMLEFT", w + 20, -30)
55 container:AddChild(chkLfr) 55 container:AddChild(chkLfr)
56 56
57 return lbl 57 return lbl, chkNormal
58 end 58 end
59 59
60 -- renders the main UI for the Combat Log tab 60 -- renders the main UI for the Combat Log tab
61 function Amr:RenderTabLog(container) 61 function Amr:RenderTabLog(container)
62 62
171 container:AddChild(_chkAutoAll) 171 container:AddChild(_chkAutoAll)
172 172
173 _autoChecks = {} 173 _autoChecks = {}
174 174
175 -- go through all supported instances, rendering in a left->right pattern, 2 per row 175 -- go through all supported instances, rendering in a left->right pattern, 2 per row
176 local autoSections = {} 176 local autoLbls = {}
177 local autoChks = {}
177 for i, instanceId in ipairs(Amr.InstanceIdsOrdered) do 178 for i, instanceId in ipairs(Amr.InstanceIdsOrdered) do
178 local autoSection = renderAutoLogSection(instanceId, container) 179 local autoLbl, autoChk = renderAutoLogSection(instanceId, container)
179 if i == 1 then 180 if i == 1 then
180 autoSection:SetPoint("TOPLEFT", _chkAutoAll.frame, "BOTTOMLEFT", -1, -15) 181 autoLbl:SetPoint("TOPLEFT", _chkAutoAll.frame, "BOTTOMLEFT", -1, -15)
181 elseif i % 2 == 0 then 182 elseif i % 2 == 0 then
182 autoSection:SetPoint("TOPLEFT", autoSections[i - 1].frame, "TOPRIGHT", 40, 0) 183 autoLbl:SetPoint("TOPLEFT", autoLbls[i - 1].frame, "TOPRIGHT", 40, 0)
183 else 184 else
184 autoSection:SetPoint("TOPLEFT", autoSections[i - 2].frame, "BOTTOMLEFT", 0, -15) 185 autoLbl:SetPoint("TOPLEFT", autoChks[i - 2].frame, "BOTTOMLEFT", 0, -30)
185 end 186 end
186 187
187 table.insert(autoSections, autoSection) 188 table.insert(autoLbls, autoLbl)
189 table.insert(autoChks, autoChk)
188 end 190 end
189 autoSections = nil 191 autoSections = nil
190 192
191 -- instructions 193 -- instructions
192 lbl = AceGUI:Create("AmrUiLabel") 194 lbl = AceGUI:Create("AmrUiLabel")