From ea603cba8b90ea73ec292534a27ae965af5a7fe5 Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Wed, 20 Dec 2017 22:12:07 +0300 Subject: [PATCH] test --- 2/3/4/5/6/7/ElvUI/Core/core.lua | 4 ++-- 2/3/4/5/6/7/ElvUI/Core/pixelperfect.lua | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/2/3/4/5/6/7/ElvUI/Core/core.lua b/2/3/4/5/6/7/ElvUI/Core/core.lua index f0fc719..69e66d7 100644 --- a/2/3/4/5/6/7/ElvUI/Core/core.lua +++ b/2/3/4/5/6/7/ElvUI/Core/core.lua @@ -230,14 +230,14 @@ function E:UpdateMedia() self["media"].bordercolor = {border.r, border.g, border.b} -- UnitFrame Border Color - border = E.db["unitframe"].colors.borderColor +--[[ border = E.db["unitframe"].colors.borderColor if self:CheckClassColor(border.r, border.g, border.b) then local classColor = E.myclass == "PRIEST" and E.PriestColors or (CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[E.myclass] or RAID_CLASS_COLORS[E.myclass]) E.db["unitframe"].colors.borderColor.r = classColor.r E.db["unitframe"].colors.borderColor.g = classColor.g E.db["unitframe"].colors.borderColor.b = classColor.b end - self["media"].unitframeBorderColor = {border.r, border.g, border.b} + self["media"].unitframeBorderColor = {border.r, border.g, border.b}]] -- Backdrop Color self["media"].backdropcolor = E:GetColorTable(self.db["general"].backdropcolor) diff --git a/2/3/4/5/6/7/ElvUI/Core/pixelperfect.lua b/2/3/4/5/6/7/ElvUI/Core/pixelperfect.lua index 5c7904b..3ba9519 100644 --- a/2/3/4/5/6/7/ElvUI/Core/pixelperfect.lua +++ b/2/3/4/5/6/7/ElvUI/Core/pixelperfect.lua @@ -60,13 +60,7 @@ function E:UIScale(event) self.eyefinity = width; end - for screenwidth, screenheight in string.gfind(GetCVar("gxResolution"), "(.+)x(.+)") do - self.mult = 768/screenheight/scale - - self.UIParent:SetWidth(screenwidth) - self.UIParent:SetHeight(screenheight) - end - --self.mult = 1; + self.mult = 768/match(GetCVar("gxResolution"), "%d+x(%d+)")/scale; self.Spacing = self.PixelMode and 0 or self.mult; self.Border = (self.PixelMode and self.mult or self.mult*2); --Set UIScale, NOTE: SetCVar for UIScale can cause taints so only do this when we need to.. @@ -106,8 +100,8 @@ function E:UIScale(event) ]] --self.UIParent:SetSize(UIParent:GetWidth() - 250, UIParent:GetHeight() - 250); - --self.UIParent:SetWidth(UIParent:GetWidth()); - --self.UIParent:SetHeight(UIParent:GetHeight()); + self.UIParent:SetWidth(GetScreenWidth()); + self.UIParent:SetHeight(GetScreenHeight()); end self.UIParent:ClearAllPoints();