From 9f756d40980fb1caaf007526efc54ec8fcd5bc1a Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Sun, 8 Jul 2018 10:49:07 +0300 Subject: [PATCH] update chat --- ElvUI/Layout/Layout.lua | 6 ++++-- ElvUI/Modules/Chat/Chat.lua | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ElvUI/Layout/Layout.lua b/ElvUI/Layout/Layout.lua index 151d58d..e884bcc 100644 --- a/ElvUI/Layout/Layout.lua +++ b/ElvUI/Layout/Layout.lua @@ -259,8 +259,9 @@ function LO:CreateChatPanels() --Left Chat Tab local lchattab = CreateFrame("Frame", "LeftChatTab", LeftChatPanel) + lchattab:SetWidth(E.db.chat.panelWidth -(SPACING*2)) + lchattab:SetHeight(PANEL_HEIGHT) lchattab:SetPoint("TOPLEFT", lchat, "TOPLEFT", SPACING, -SPACING) - lchattab:SetPoint("BOTTOMRIGHT", lchat, "TOPRIGHT", -SPACING, -(SPACING + PANEL_HEIGHT)) E:SetTemplate(lchattab, E.db.chat.panelTabTransparency == true and "Transparent" or "Default", true) --Left Chat Data Panel @@ -306,8 +307,9 @@ function LO:CreateChatPanels() --Right Chat Tab local rchattab = CreateFrame("Frame", "RightChatTab", RightChatPanel) + rchattab:SetWidth((E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) -(SPACING*2)) + rchattab:SetHeight(PANEL_HEIGHT) rchattab:SetPoint("TOPRIGHT", rchat, "TOPRIGHT", -SPACING, -SPACING) - rchattab:SetPoint("BOTTOMLEFT", rchat, "TOPLEFT", SPACING, -(SPACING + PANEL_HEIGHT)) E:SetTemplate(rchattab, E.db.chat.panelTabTransparency == true and "Transparent" or "Default", true) --Right Chat Data Panel diff --git a/ElvUI/Modules/Chat/Chat.lua b/ElvUI/Modules/Chat/Chat.lua index 2d9fef8..622744f 100644 --- a/ElvUI/Modules/Chat/Chat.lua +++ b/ElvUI/Modules/Chat/Chat.lua @@ -401,8 +401,15 @@ end function CH:PositionChat(override) if ((not override and self.initialMove) or (not override)) then return end if not RightChatPanel or not LeftChatPanel then return end - E:Size(RightChatPanel, E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth, E.db.chat.separateSizes and E.db.chat.panelHeightRight or E.db.chat.panelHeight) - E:Size(LeftChatPanel, E.db.chat.panelWidth, E.db.chat.panelHeight) + RightChatPanel:SetWidth(E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) + RightChatPanel:SetHeight(E.db.chat.separateSizes and E.db.chat.panelHeightRight or E.db.chat.panelHeight) + LeftChatPanel:SetWidth(E.db.chat.panelWidth) + LeftChatPanel:SetHeight(E.db.chat.panelHeight) + + LeftChatTab:SetWidth(E.db.chat.panelWidth -((E.Border*3 - E.Spacing)*2)) + LeftChatDataPanel:SetWidth(E.db.chat.panelWidth -(((E.Border*3 - E.Spacing)*2) + 16)) + RightChatTab:SetWidth((E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) -((E.Border*3 - E.Spacing)*2)) + RightChatDataPanel:SetWidth((E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) -(((E.Border*3 - E.Spacing)*2) + 16)) self.RightChatWindowID = FindRightChatID() @@ -431,11 +438,9 @@ function CH:PositionChat(override) BASE_OFFSET = BASE_OFFSET - 24 E:Point(chat, "BOTTOMLEFT", RightChatDataPanel, "BOTTOMLEFT", 1, 1) end - if id ~= 2 then - E:Size(chat, (E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) - 11, (E.db.chat.separateSizes and E.db.chat.panelHeightRight or E.db.chat.panelHeight) - BASE_OFFSET) - else - E:Size(chat, E.db.chat.panelWidth - 11, (E.db.chat.panelHeight - BASE_OFFSET)) - end + + chat:SetWidth((E.db.chat.separateSizes and E.db.chat.panelWidthRight or E.db.chat.panelWidth) - 11) + chat:SetHeight((E.db.chat.separateSizes and E.db.chat.panelHeightRight or E.db.chat.panelHeight) - BASE_OFFSET) tab:SetParent(RightChatPanel) chat:SetParent(RightChatPanel) @@ -461,8 +466,8 @@ function CH:PositionChat(override) BASE_OFFSET = BASE_OFFSET - 24 E:Point(chat, "BOTTOMLEFT", LeftChatToggleButton, "BOTTOMLEFT", 1, 1) end - - E:Size(chat, E.db.chat.panelWidth - 11, E.db.chat.panelHeight - BASE_OFFSET) + chat:SetWidth(E.db.chat.panelWidth - 11) + chat:SetHeight((E.db.chat.panelHeight - BASE_OFFSET)) end chat:SetParent(LeftChatPanel) if i > 2 then