From 4158cc9f1935dfb63b2ffa8ce57c273a377bd154 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Fri, 8 Aug 2014 02:10:52 +0400 Subject: [PATCH] Cleanup and fix for our chat icons fuck up Elv's icons --- ElvUI_SLE/modules/chat.lua | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/ElvUI_SLE/modules/chat.lua b/ElvUI_SLE/modules/chat.lua index 832c777..7ab4900 100644 --- a/ElvUI_SLE/modules/chat.lua +++ b/ElvUI_SLE/modules/chat.lua @@ -147,14 +147,7 @@ local function Position() tab = _G[format("ChatFrame%sTab", i)] point = GetChatWindowSavedPosition(id) isDocked = chat.isDocked - --[[if id > NUM_CHAT_WINDOWS then - point = point or select(1, chat:GetPoint()); - if select(2, tab:GetPoint()):GetName() ~= bg then - isDocked = true - else - isDocked = false - end - end]] + if point == "BOTTOMRIGHT" and chat:IsShown() and not (id > NUM_CHAT_WINDOWS) and id == CH.RightChatWindowID then chat:ClearAllPoints() if E.db.datatexts.rightChatPanel then @@ -173,23 +166,6 @@ local function Position() end end -local function GetBNFriendColor(name, id) - local _, _, game, _, _, _, _, class = BNGetToonInfo(id) - - if game ~= BNET_CLIENT_WOW or not class then - return name - else - for k,v in pairs(LOCALIZED_CLASS_NAMES_MALE) do if class == v then class = k end end - for k,v in pairs(LOCALIZED_CLASS_NAMES_FEMALE) do if class == v then class = k end end - - if RAID_CLASS_COLORS[class] then - return "|c"..RAID_CLASS_COLORS[class].colorStr..name.."|r" - else - return name - end - end -end - local function GetChatIcon(sender) local senderName, senderRealm if sender then @@ -213,11 +189,11 @@ local function GetChatIcon(sender) return leader end - return "" + return end function CH:GetPluginReplacementIcon(arg2, arg6, type) - local icon; + local icon = nil; if arg6 and (strlen(arg6) > 0) then if ( arg6 == "GM" ) then --If it was a whisper, dispatch it to the GMChat addon. @@ -241,6 +217,7 @@ function CH:GetPluginReplacementIcon(arg2, arg6, type) icon = lfgRoles[arg2]..icon end end + if icon == "" then icon = nil end return icon, true end -- 1.7.9.5