Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

E:Point, E:Size, E:Width, E:Height, & cleanup

Browse Source
This commit is contained in:
Crum
2018-05-16 23:20:04 -05:00
parent eac6a04517
commit d52da42f77
65 changed files with 958 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/pixelperfect.lua
+44 -46
View File
@@ -2,12 +2,12 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
--Cache global variables
--Lua functions
local abs, floor, min, max = math.abs, math.floor, math.min, math.max;
local match = string.match;
local abs, floor, min, max = math.abs, math.floor, math.min, math.max
local match = string.match
--WoW API / Variables
local IsMacClient = IsMacClient;
local GetCVar, SetCVar = GetCVar, SetCVar;
local GetScreenHeight, GetScreenWidth = GetScreenHeight, GetScreenWidth;
local IsMacClient = IsMacClient
local GetCVar, SetCVar = GetCVar, SetCVar
local GetScreenHeight, GetScreenWidth = GetScreenHeight, GetScreenWidth
local scale
@@ -17,56 +17,56 @@ function E:UIScale(event)
self.screenwidth = self.global.screenwidth
end
if(GetCVar("UIScale")) then
self.global.uiScale = GetCVar("UIScale");
if GetCVar("UIScale") then
self.global.uiScale = GetCVar("UIScale")
end
local minScale = self.global.general.minUiScale or 0.64;
if(self.global.general.autoScale) then
scale = max(minScale, min(1.00, 768/self.screenheight));
local minScale = self.global.general.minUiScale or 0.64
if self.global.general.autoScale then
scale = max(minScale, min(1.00, 768/self.screenheight))
else
scale = max(minScale, min(1.00, self.global.uiScale or UIParent:GetScale() or 768/self.screenheight));
scale = max(minScale, min(1.00, self.global.uiScale or UIParent:GetScale() or 768/self.screenheight))
end
if self.screenwidth < 1600 then
self.lowversion = true;
self.lowversion = true
elseif self.screenwidth >= 3840 and self.global.general.eyefinity then
local width = self.screenwidth;
local height = self.screenheight;
local width = self.screenwidth
local height = self.screenheight
-- because some user enable bezel compensation, we need to find the real width of a single monitor.
-- I don't know how it really work, but i'm assuming they add pixel to width to compensate the bezel. :P
-- HQ resolution
if width >= 9840 then width = 3280; end -- WQSXGA
if width >= 7680 and width < 9840 then width = 2560; end -- WQXGA
if width >= 5760 and width < 7680 then width = 1920; end -- WUXGA & HDTV
if width >= 5040 and width < 5760 then width = 1680; end -- WSXGA+
if width >= 7680 and width < 9840 then width = 2560 end -- WQXGA
if width >= 5760 and width < 7680 then width = 1920 end -- WUXGA & HDTV
if width >= 5040 and width < 5760 then width = 1680 end -- WSXGA+
-- adding height condition here to be sure it work with bezel compensation because WSXGA+ and UXGA/HD+ got approx same width
if width >= 4800 and width < 5760 and height == 900 then width = 1600; end -- UXGA & HD+
if width >= 4800 and width < 5760 and height == 900 then width = 1600 end -- UXGA & HD+
-- low resolution screen
if width >= 4320 and width < 4800 then width = 1440; end -- WSXGA
if width >= 4080 and width < 4320 then width = 1360; end -- WXGA
if width >= 3840 and width < 4080 then width = 1224; end -- SXGA & SXGA (UVGA) & WXGA & HDTV
if width >= 4320 and width < 4800 then width = 1440 end -- WSXGA
if width >= 4080 and width < 4320 then width = 1360 end -- WXGA
if width >= 3840 and width < 4080 then width = 1224 end -- SXGA & SXGA (UVGA) & WXGA & HDTV
-- yep, now set ElvUI to lower resolution if screen #1 width < 1600
if width < 1600 then
self.lowversion = true;
self.lowversion = true
end
-- register a constant, we will need it later for launch.lua
self.eyefinity = width;
self.eyefinity = width
end
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);
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..
if E.Round and E:Round(UIParent:GetScale(), 5) ~= E:Round(scale, 5) and (event == "PLAYER_LOGIN") then
SetCVar("UseUIScale", 1);
SetCVar("UIScale", scale);
SetCVar("UseUIScale", 1)
SetCVar("UIScale", scale)
WorldMapFrame.hasTaint = true;
end
@@ -78,21 +78,20 @@ function E:UIScale(event)
--Resize self.UIParent if Eyefinity is on.
if self.eyefinity then
local width = self.eyefinity;
local height = self.screenheight;
local width = self.eyefinity
local height = self.screenheight
-- if autoscale is off, find a new width value of self.UIParent for screen #1.
if not self.global.general.autoScale or height > 1200 then
local h = UIParent:GetHeight();
local ratio = self.screenheight / h;
local w = self.eyefinity / ratio;
local h = UIParent:GetHeight()
local ratio = self.screenheight / h
local w = self.eyefinity / ratio
width = w;
height = h;
width = w
height = h
end
self.UIParent:SetWidth(width);
self.UIParent:SetHeight(height);
E:Size(self.UIParent, width, height)
else
--[[Eyefinity Test mode
Resize the E.UIParent to be smaller than it should be, all objects inside should relocate.
@@ -100,17 +99,16 @@ function E:UIScale(event)
]]
--self.UIParent:SetSize(UIParent:GetWidth() - 250, UIParent:GetHeight() - 250);
self.UIParent:SetWidth(GetScreenWidth());
self.UIParent:SetHeight(GetScreenHeight());
E:Size(self.UIParent, GetScreenWidth(), GetScreenHeight())
end
self.UIParent:ClearAllPoints();
self.UIParent:SetPoint("CENTER", UIParent);
self.UIParent:ClearAllPoints()
E:Point(self.UIParent, "CENTER", UIParent)
self.diffGetLeft = E:Round(abs(UIParent:GetLeft() - self.UIParent:GetLeft()));
self.diffGetRight = E:Round(abs(UIParent:GetRight() - self.UIParent:GetRight()));
self.diffGetTop = E:Round(abs(UIParent:GetTop() - self.UIParent:GetTop()));
self.diffGetBottom = E:Round(abs(UIParent:GetBottom() - self.UIParent:GetBottom()));
self.diffGetLeft = E:Round(abs(UIParent:GetLeft() - self.UIParent:GetLeft()))
self.diffGetRight = E:Round(abs(UIParent:GetRight() - self.UIParent:GetRight()))
self.diffGetTop = E:Round(abs(UIParent:GetTop() - self.UIParent:GetTop()))
self.diffGetBottom = E:Round(abs(UIParent:GetBottom() - self.UIParent:GetBottom()))
local change
if E.Round then
@@ -129,5 +127,5 @@ end
-- pixel perfect script of custom ui scale.
function E:Scale(x)
return self.mult*floor(x/self.mult+.5);
return self.mult*floor(x/self.mult+.5)
end