Commit 69c63faa authored by Merathilis's avatar Merathilis

Code Cleanup

parent e19f7711
......@@ -21,8 +21,6 @@ function MER:LoadBigWigsProfileDPS()
if BigWigs3DB["profiles"][key] == nil then
BigWigs3DB = {
["namespaces"] = {
["BigWigs_Plugins_Victory"] = {},
["BigWigs_Plugins_Colors"] = {},
["BigWigs_Plugins_Alt Power"] = {
["profiles"] = {
[key] = {
......@@ -35,7 +33,6 @@ function MER:LoadBigWigsProfileDPS()
},
},
},
["BigWigs_Plugins_BossBlock"] = {},
["BigWigs_Plugins_Colors"] = {
["profiles"] = {
[key] = {
......
......@@ -324,12 +324,12 @@ end
local collectedInstanceImages = false
function module.OnEnter(self)
RequestRaidInfo()
if E.db.mui.microBar.tooltip ~= true then
return
end
RequestRaidInfo()
if not GameTooltip:IsForbidden() then
GameTooltip:Hide() -- WHY??? BECAUSE FUCK GAMETOOLTIP, THATS WHY!!
end
......
......@@ -44,19 +44,12 @@ local function ArmoryTable()
order = 3,
name = L["Azerite Buttons"],
desc = L["Enable/Disable the Azerite Buttons on the character window."],
},
undressButton = {
type = "toggle",
order = 4,
name = L["Undress Button"],
},
gradient = {
type = "toggle",
order = 7,
name = L["Slot Gradient"],
desc = L["Shows a gradiation texture on the Character Slots."],
},
spacer = {
type = "description",
order = 8,
......
......@@ -133,24 +133,19 @@ local function Cooldowns()
type = "toggle",
name = L["Enable"],
},
space1 = {
spacer = {
order = 2,
type = "description",
name = "",
},
space1 = {
order = 3,
type = "description",
name = "",
},
width = {
order = 4,
order = 3,
type = "range",
name = L["Width"],
min = 5, max = 500, step = 1,
},
height = {
order = 5,
order = 4,
type = "range",
name = L["Height"],
min = 5, max = 200, step = 1,
......@@ -175,7 +170,7 @@ local function Cooldowns()
type = "toggle",
name = L["Show Icons"],
},
spacer = {
spacer1 = {
order = 10,
type = "description",
name = "",
......
......@@ -34,6 +34,7 @@ local CHALLENGE_MODE = CHALLENGE_MODE
local PlayerHasToy = PlayerHasToy
local C_GarrisonIsPlayerInGarrison = C_Garrison.IsPlayerInGarrison
local C_ToyBox = C_ToyBox
local Minimap = Minimap
local UnitFactionGroup = UnitFactionGroup
local RAID_CLASS_COLORS = RAID_CLASS_COLORS
local RegisterStateDriver = RegisterStateDriver
......@@ -240,8 +241,8 @@ local function CreateCoords()
if module.db.format == nil then return end
local x, y = E.MapInfo.x or 0, E.MapInfo.y or 0
if x then x = format(module.db.format, x * 100) else x = "0" or " " end
if y then y = format(module.db.format, y * 100) else y = "0" or " " end
if x then x = format(module.db.format, x * 100) else x = "0" end
if y then y = format(module.db.format, y * 100) else y = "0" end
return x, y
end
......@@ -249,7 +250,7 @@ end
function module:CreateLocationPanel()
--Main Panel
loc_panel = CreateFrame('Frame', "MER_LocPanel", E.UIParent)
loc_panel:Point("TOP", E.UIParent, "TOP", 0, -1)
loc_panel:SetPoint("TOP", E.UIParent, "TOP", 0, -1)
loc_panel:SetFrameStrata("MEDIUM")
loc_panel:SetFrameLevel(Minimap:GetFrameLevel()+1)
loc_panel:EnableMouse(true)
......@@ -257,20 +258,20 @@ function module:CreateLocationPanel()
loc_panel:SetScript("OnUpdate", module.UpdateCoords)
-- Location Text
loc_panel.Text = loc_panel:CreateFontString(nil, "LOW")
loc_panel.Text:Point("CENTER", 0, 0)
loc_panel.Text = loc_panel:CreateFontString(nil, "BACKGROUND")
loc_panel.Text:SetPoint("CENTER", 0, 0)
loc_panel.Text:SetWordWrap(false)
E.FrameLocks[loc_panel] = true
--Coords
loc_panel.Xcoord = CreateFrame('Frame', "MER_LocPanel_X", loc_panel)
loc_panel.Xcoord:SetPoint("RIGHT", loc_panel, "LEFT", 1 - 2*E.Spacing, 0)
loc_panel.Xcoord.Text = loc_panel.Xcoord:CreateFontString(nil, "LOW")
loc_panel.Xcoord.Text = loc_panel.Xcoord:CreateFontString(nil, "BACKGROUND")
loc_panel.Xcoord.Text:Point("CENTER", 0, 0)
loc_panel.Ycoord = CreateFrame('Frame', "MER_LocPanel_Y", loc_panel)
loc_panel.Ycoord:SetPoint("LEFT", loc_panel, "RIGHT", -1 + 2*E.Spacing, 0)
loc_panel.Ycoord.Text = loc_panel.Ycoord:CreateFontString(nil, "LOW")
loc_panel.Ycoord.Text = loc_panel.Ycoord:CreateFontString(nil, "BACKGROUND")
loc_panel.Ycoord.Text:Point("CENTER", 0, 0)
module:Resize()
......
......@@ -91,7 +91,7 @@ end
function module:Construct_AuraIcon(button)
-- Creates an own font element for caster name
if not button.cc_name then
button.cc_name = button:CreateFontString("OVERLAY")
button.cc_name = button:CreateFontString(nil, "OVERLAY")
button.cc_name:FontTemplate(nil, 10, "OUTLINE")
button.cc_name:Point("BOTTOM", button, "TOP", 1, 1)
button.cc_name:SetJustifyH("CENTER")
......
......@@ -31,7 +31,7 @@ local function NameplatesTable()
name = L["Castbar Shield"],
desc = L["Show a shield icon on the castbar for non interruptible spells."],
},
spacer = {
spacer1 = {
order = 3,
type = "description",
name = " ",
......
......@@ -33,7 +33,7 @@ local function styleMail()
MiniMapMailFrame.highlight:SetAllPoints(MiniMapMailFrame)
MiniMapMailFrame.highlight:SetFrameLevel(MiniMapMailFrame:GetFrameLevel() + 1)
MiniMapMailFrame.highlight.tex = MiniMapMailFrame.highlight:CreateTexture("OVERLAY")
MiniMapMailFrame.highlight.tex = MiniMapMailFrame.highlight:CreateTexture()
MiniMapMailFrame.highlight.tex:SetTexture("Interface\\AddOns\\ElvUI_MerathilisUI\\media\\textures\\Mail")
MiniMapMailFrame.highlight.tex:SetPoint("TOPLEFT", _G.MiniMapMailIcon, "TOPLEFT", -2, 2)
MiniMapMailFrame.highlight.tex:SetPoint("BOTTOMRIGHT", _G.MiniMapMailIcon, "BOTTOMRIGHT", 2, -2)
......
......@@ -53,7 +53,7 @@ function MGCD:LoadGCDBar(frame)
gcdbar.height = 2
gcdbar:Hide()
gcdbar.spark = gcdbar:CreateTexture(nil, "DIALOG")
gcdbar.spark = gcdbar:CreateTexture(nil, "OVERLAY")
gcdbar.spark:SetTexture("Interface\\ChatFrame\\ChatFrameBackground")
gcdbar.spark:SetVertexColor(unpack(gcdbar.Color))
gcdbar.spark:SetWidth(gcdbar.width)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment