diff --git a/SVUI_!Core/system/core.lua b/SVUI_!Core/system/core.lua index 8132e2a..677283e 100644 --- a/SVUI_!Core/system/core.lua +++ b/SVUI_!Core/system/core.lua @@ -43,21 +43,6 @@ local tinsert = _G.tinsert; local tremove = _G.tremove; local wipe = _G.wipe; --BLIZZARD API -local ReloadUI = _G.ReloadUI; -local GetLocale = _G.GetLocale; -local CreateFrame = _G.CreateFrame; -local IsAddOnLoaded = _G.IsAddOnLoaded; -local InCombatLockdown = _G.InCombatLockdown; -local GetAddOnInfo = _G.GetAddOnInfo; -local LoadAddOn = _G.LoadAddOn; -local LibStub = _G.LibStub; -local GetAddOnMetadata = _G.GetAddOnMetadata; -local GetCVarBool = _G.GetCVarBool; -local GameTooltip = _G.GameTooltip; -local StaticPopup_Hide = _G.StaticPopup_Hide; - -local IsInInstance = _G.IsInInstance; -local hooksecurefunc = _G.hooksecurefunc; local collectgarbage = _G.collectgarbage; local ERR_NOT_IN_COMBAT = _G.ERR_NOT_IN_COMBAT; diff --git a/SVUI_!Core/system/layout.lua b/SVUI_!Core/system/layout.lua index 2ba8388..28e80ef 100644 --- a/SVUI_!Core/system/layout.lua +++ b/SVUI_!Core/system/layout.lua @@ -70,7 +70,7 @@ UIPanels["BlackMarketFrame"] = { moving = false, snapped = false, canupdate UIPanels["CalendarFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; UIPanels["CharacterFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["ClassTrainerFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; ---UIPanels["ColorPickerFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; +UIPanels["CollectionsJournal"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["DressUpFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["DraenorZoneAbilityFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["EncounterJournal"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; diff --git a/SVUI_Maps/Loader.lua b/SVUI_Maps/Loader.lua index da35963..794daa2 100644 --- a/SVUI_Maps/Loader.lua +++ b/SVUI_Maps/Loader.lua @@ -142,7 +142,14 @@ function MOD:LoadOptions() order = 4, type = "select", name = "Minimap Shape", - desc = "Select the shape of your minimap.", + desc = function() + if(GetCVar("rotateMinimap") ~= "0") then + return "Disabled while the 'Rotate Minimap' option is enabled."; + else + return "Select the shape of your minimap."; + end + end, + disabled = function() return (GetCVar("rotateMinimap") ~= "0") end, values = { ['RECTANGLE'] = 'Rectangular (Default)', ['SQUARE'] = 'Square', diff --git a/SVUI_QuestTracker/Loader.lua b/SVUI_QuestTracker/Loader.lua index d727b11..05edf1a 100644 --- a/SVUI_QuestTracker/Loader.lua +++ b/SVUI_QuestTracker/Loader.lua @@ -68,21 +68,26 @@ function MOD:LoadOptions() type = "group", name = "General", guiInline = true, - get = function(a)return SV.db[Schema][a[#a]] end, - set = function(a,b) - MOD:ChangeDBVar(b,a[#a]); - SV:StaticPopup_Show("RL_CLIENT") - end, args = { rowHeight = { order = 1, type = 'range', - name = L["Row Height"], + name = L["Row Height (minimum adjusted by font size)"], desc = L["Setting this to 0 (zero) will force an automatic size"], min = 0, max = 50, step = 1, width = "full", + get = function(a)return SV.db[Schema][a[#a]] end, + set = function(a,b) + local c = SV.media.shared.font.questdialog.size; + local d = c + 4; + if((b > 0) and (b < d)) then + b = d; + end + MOD:ChangeDBVar(b,a[#a]); + MOD:UpdateSetup(); + end }, } }, diff --git a/SVUI_QuestTracker/SVUI_QuestTracker.lua b/SVUI_QuestTracker/SVUI_QuestTracker.lua index 85ff683..e948d26 100644 --- a/SVUI_QuestTracker/SVUI_QuestTracker.lua +++ b/SVUI_QuestTracker/SVUI_QuestTracker.lua @@ -242,8 +242,7 @@ local OBJECTIVE_HEADER_Get = function(self, index) objective.Icon = objective:CreateTexture(nil,"OVERLAY"); objective.Icon:SetPoint("TOPLEFT", objective, "TOPLEFT", 4, -2); - objective.Icon:SetPoint("BOTTOMLEFT", objective, "BOTTOMLEFT", 4, 2); - objective.Icon:SetWidth(16); + objective.Icon:SetSize(INNER_HEIGHT,INNER_HEIGHT); objective.Icon:SetTexture(OBJ_ICON_INCOMPLETE); objective.Text = objective:CreateFontString(nil,"OVERLAY"); @@ -393,11 +392,19 @@ local function PostFadeOutCallback(location) --print(MOD.DOCK_IS_FADED) end +function MOD:UpdateSetup() + for headerName, headerFrame in pairs(MOD.Headers) do + if(headerFrame.Refresh) then + headerFrame:Refresh() + end + end +end + function MOD:UpdateLocals() ROW_WIDTH = self.Docklet.ScrollFrame:GetWidth(); local baseWidth = SV.db.QuestTracker.rowHeight; - local calculated = SV.media.shared.font.questdialog.size / 0.55; - ROW_HEIGHT = (baseWidth == 0) and calculated or baseWidth; + local calculated = SV.media.shared.font.questdialog.size + 4; + ROW_HEIGHT = (baseWidth < calculated) and calculated or baseWidth; INNER_HEIGHT = ROW_HEIGHT - 4; LARGE_ROW_HEIGHT = ROW_HEIGHT * 2; LARGE_INNER_HEIGHT = LARGE_ROW_HEIGHT - 4; diff --git a/SVUI_QuestTracker/components/active.lua b/SVUI_QuestTracker/components/active.lua index 6a6ae0b..c63a80f 100644 --- a/SVUI_QuestTracker/components/active.lua +++ b/SVUI_QuestTracker/components/active.lua @@ -203,11 +203,8 @@ local SetActiveData = function(self, title, level, icon, questID, questLogIndex, if(objective_rows > 0) then objective_block:SetHeight(fill_height); objective_block:FadeIn(); - fill_height = fill_height + (LARGE_INNER_HEIGHT + 2); - else - fill_height = fill_height + LARGE_INNER_HEIGHT + 12; end - + fill_height = fill_height + (LARGE_INNER_HEIGHT + 8); block:SetHeight(fill_height); MOD.Docklet.ScrollFrame.ScrollBar:SetValue(0); diff --git a/SVUI_Skins/components/blizzard/petjournal.lua b/SVUI_Skins/components/blizzard/petjournal.lua index f5a7c32..0916b0a 100644 --- a/SVUI_Skins/components/blizzard/petjournal.lua +++ b/SVUI_Skins/components/blizzard/petjournal.lua @@ -230,9 +230,9 @@ local function CollectionsJournalStyle() PetJournalPetCardPetInfo.favorite:SetParent(fg) PetJournalPetCardPetInfo.Panel:WrapPoints(PetJournalPetCardPetInfoIcon) PetJournalPetCardPetInfoIcon:SetParent(PetJournalPetCardPetInfo.Panel) - PetJournalPetCardPetInfo.level:SetParent(PetJournalPetCardPetInfo.Panel) - local R = PetJournalPrimaryAbilityTooltip;R.Background:SetTexture("") + local R = PetJournalPrimaryAbilityTooltip; + R.Background:SetTexture("") if R.Delimiter1 then R.Delimiter1:SetTexture("") R.Delimiter2:SetTexture("")