diff --git a/ElvUI_SLE/modules/exprepbar/exprepbar.lua b/ElvUI_SLE/modules/exprepbar/exprepbar.lua index 8784c2e..196cacc 100644 --- a/ElvUI_SLE/modules/exprepbar/exprepbar.lua +++ b/ElvUI_SLE/modules/exprepbar/exprepbar.lua @@ -5,9 +5,8 @@ local M = E:GetModule('Misc'); local BAR_WIDTH --Set post load so we can set it to a percent of your screen width. local BAR_HEIGHT = 10 -- was 9 -local TOPBAR_HEIGHT = ((BAR_HEIGHT) * 3)+1 -- was ((BAR_HEIGHT + 2) * 4) + BAR_HEIGHT +local TOPBAR_HEIGHT = ((BAR_HEIGHT) * 3) + 1 -- was ((BAR_HEIGHT + 2) * 4) + BAR_HEIGHT local showRepBar, showExpBar = false, false -local RBRWidth = ((E.MinimapSize - 6) / 6 + 4) local function GetXP(unit) if(unit == 'pet') then @@ -123,7 +122,7 @@ function M:UpdateExpBar(event) local bar = UpperExperienceBar if not bar then bar = CreateFrame('StatusBar', 'UpperExperienceBar', UpperRepExpBar) - bar:Size(BAR_WIDTH + RBRWidth, BAR_HEIGHT) + bar:Size(BAR_WIDTH + E.RBRWidth, BAR_HEIGHT) bar:CreateBackdrop('Default') bar:SetStatusBarTexture(E.media.normTex) bar:SetFrameLevel(UpperRepExpBar:GetFrameLevel() + 3) @@ -131,7 +130,7 @@ function M:UpdateExpBar(event) -- Set the text -- bar.txt = bar:CreateFontString(nil,'OVERLAY') - bar.txt:FontTemplate(nil, 11) -- change fontsize here + bar.txt:FontTemplate(nil, 10) -- change fontsize here bar.txt:Point('CENTER', UpperExperienceBar, 'CENTER', 0, 0) bar.txt:SetJustifyH('CENTER') bar.txt:SetJustifyV('MIDDLE') @@ -203,7 +202,7 @@ function M:UpdateRepBar(event) local name, reaction, min, max, value = GetWatchedFactionInfo() if not bar then bar = CreateFrame('StatusBar', 'UpperReputationBar', UpperRepExpBar) - bar:Size(BAR_WIDTH + RBRWidth, BAR_HEIGHT) + bar:Size(BAR_WIDTH + E.RBRWidth, BAR_HEIGHT) bar:CreateBackdrop('Default') bar:SetStatusBarTexture(E.media.normTex) bar:SetFrameLevel(UpperRepExpBar:GetFrameLevel() + 3) @@ -213,7 +212,7 @@ function M:UpdateRepBar(event) bar:SetScript('OnLeave', OnLeave) -- set the text bar.txt = bar:CreateFontString(nil,'OVERLAY') - bar.txt:FontTemplate(nil, 11) -- change fontsize here + bar.txt:FontTemplate(nil, 10) -- change fontsize here bar.txt:Point('CENTER', UpperReputationBar, 'CENTER', 0, 0) bar.txt:SetJustifyH('CENTER') bar.txt:SetJustifyV('MIDDLE') @@ -248,18 +247,21 @@ function M:UpdateExpRepBarAnchor() BAR_WIDTH = E.eyefinity or E.UIParent:GetWidth(); BAR_WIDTH = BAR_WIDTH / 5 UpperRepExpBarHolder:Point('TOP', E.UIParent, 'TOP', 0, -25) UpperRepExpBarHolder:SetParent(E.UIParent) - + elseif E.db.general.raidReminder == true then + BAR_WIDTH = E.MinimapSize + 1 + UpperRepExpBarHolder:Point('TOP', MMHolder, 'BOTTOM', 1, -5) + UpperRepExpBarHolder:SetParent(Minimap) else - BAR_WIDTH = E.MinimapSize+1 -- strange... should be fine without this +1 but it's needed :( - UpperRepExpBarHolder:Point('TOP', MMHolder, 'BOTTOM', 1, -4) + BAR_WIDTH = E.MinimapSize + UpperRepExpBarHolder:Point('TOP', MMHolder, 'BOTTOM', 0, -5) UpperRepExpBarHolder:SetParent(Minimap) end UpperRepExpBarHolder:SetFrameLevel(0) - UpperRepExpBarHolder:Size(BAR_WIDTH - 30 + RBRWidth, TOPBAR_HEIGHT) + UpperRepExpBarHolder:Size(BAR_WIDTH - 30 + E.RBRWidth, TOPBAR_HEIGHT) if UpperReputationBar then - UpperReputationBar:Size(BAR_WIDTH + RBRWidth, BAR_HEIGHT) + UpperReputationBar:Size(BAR_WIDTH + E.RBRWidth, BAR_HEIGHT) if E.db.sle.xprepinfo.enabled then M:CreateRepTextString() else @@ -268,7 +270,7 @@ function M:UpdateExpRepBarAnchor() end if UpperExperienceBar then - UpperExperienceBar:Size(BAR_WIDTH + RBRWidth, BAR_HEIGHT) + UpperExperienceBar:Size(BAR_WIDTH + E.RBRWidth, BAR_HEIGHT) if E.db.sle.xprepinfo.enabled then M:CreateExpTextString() else