Skip to content

Commit a3caaba

Browse files
committed
Merge branch 'main' into classic-beta
2 parents 5a7eced + 1d48662 commit a3caaba

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ElvUI_Libraries/Core/Ace3-ElvUI/AceGUIWidget-Button-ElvUI.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Constructor
139139
-------------------------------------------------------------------------------]]
140140
local S -- ref for Skins module in ElvUI
141141
local function Constructor()
142-
local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
142+
local name = "ElvUIAceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
143143
local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
144144
frame:Hide()
145145
frame:EnableMouse(true)

ElvUI_Libraries/Core/Ace3-ElvUI/AceGUIWidget-DropDown-ElvUI.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ do
340340
local function Constructor()
341341
local count = AceGUI:GetNextWidgetNum(widgetType)
342342
local frame = CreateFrame("Frame", nil, UIParent)
343-
local dropdown = CreateFrame("Frame", "AceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate")
343+
local dropdown = CreateFrame("Frame", "ElvUIAceGUI30DropDown"..count, frame, "UIDropDownMenuTemplate")
344344

345345
local self = {}
346346
self.type = widgetType

ElvUI_Libraries/Core/Ace3-ElvUI/AceGUIWidget-EditBox-ElvUI.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ end
2525

2626
function _G.AceGUIEditBoxInsertLink(text)
2727
for i = 1, AceGUI:GetWidgetCount(Type) do
28-
local editbox = _G["AceGUI-3.0EditBox"..i]
28+
local editbox = _G["ElvUIAceGUI-3.0EditBox"..i]
2929
if editbox and editbox:IsVisible() and editbox:HasFocus() then
3030
editbox:Insert(text)
3131
return true
@@ -220,7 +220,7 @@ local function Constructor()
220220
local frame = CreateFrame("Frame", nil, UIParent)
221221
frame:Hide()
222222

223-
local editbox = CreateFrame("EditBox", "AceGUI-3.0EditBox"..num, frame, "InputBoxTemplate")
223+
local editbox = CreateFrame("EditBox", "ElvUIAceGUI-3.0EditBox"..num, frame, "InputBoxTemplate")
224224
editbox:SetAutoFocus(false)
225225
editbox:SetFontObject(_G.ChatFontNormal)
226226
editbox:SetScript("OnEnter", Control_OnEnter)

0 commit comments

Comments
 (0)