This commit is contained in:
Bunny67
2017-12-20 22:12:07 +03:00
parent 4d2a52fef1
commit ea603cba8b
2 changed files with 5 additions and 11 deletions
+2 -2
View File
@@ -230,14 +230,14 @@ function E:UpdateMedia()
self["media"].bordercolor = {border.r, border.g, border.b} self["media"].bordercolor = {border.r, border.g, border.b}
-- UnitFrame Border Color -- 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 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]) 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.r = classColor.r
E.db["unitframe"].colors.borderColor.g = classColor.g E.db["unitframe"].colors.borderColor.g = classColor.g
E.db["unitframe"].colors.borderColor.b = classColor.b E.db["unitframe"].colors.borderColor.b = classColor.b
end end
self["media"].unitframeBorderColor = {border.r, border.g, border.b} self["media"].unitframeBorderColor = {border.r, border.g, border.b}]]
-- Backdrop Color -- Backdrop Color
self["media"].backdropcolor = E:GetColorTable(self.db["general"].backdropcolor) self["media"].backdropcolor = E:GetColorTable(self.db["general"].backdropcolor)
+3 -9
View File
@@ -60,13 +60,7 @@ function E:UIScale(event)
self.eyefinity = width; self.eyefinity = width;
end end
for screenwidth, screenheight in string.gfind(GetCVar("gxResolution"), "(.+)x(.+)") do self.mult = 768/match(GetCVar("gxResolution"), "%d+x(%d+)")/scale;
self.mult = 768/screenheight/scale
self.UIParent:SetWidth(screenwidth)
self.UIParent:SetHeight(screenheight)
end
--self.mult = 1;
self.Spacing = self.PixelMode and 0 or self.mult; self.Spacing = self.PixelMode and 0 or self.mult;
self.Border = (self.PixelMode and self.mult or self.mult*2); 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.. --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:SetSize(UIParent:GetWidth() - 250, UIParent:GetHeight() - 250);
--self.UIParent:SetWidth(UIParent:GetWidth()); self.UIParent:SetWidth(GetScreenWidth());
--self.UIParent:SetHeight(UIParent:GetHeight()); self.UIParent:SetHeight(GetScreenHeight());
end end
self.UIParent:ClearAllPoints(); self.UIParent:ClearAllPoints();