Merge branch 'development'

# Conflicts:
#	CHANGELOG.md
#	ElvUI/Core/Toolkit.lua

ElvUI/Core/PixelPerfect.lua

@@ -31,7 +31,7 @@ function E:UIScale(init)
 
 		E.mult = (bestScale / scale) - ((bestScale - pixelScale) / scale)
 		E.Spacing = (E.PixelMode and 0) or E.mult
-		E.Border = (E.PixelMode and E.mult) or E.mult*2
+		E.Border = ((not E.twoPixelsPlease) and E.PixelMode and E.mult) or E.mult*2
 	else --E.Initialize
 		local UIParent = _G.UIParent
 		UIParent:SetScale(scale)

ElvUI/Core/Toolkit.lua

@@ -48,9 +48,7 @@ local function customSetBackdrop(frame, giveBorder, bgFile, edgeSize, insetLeft,
 end
 
 local function customBackdropColor(frame, r, g, b, a, skip)
-	if skip == 'ElvUI' then
-		return
-	elseif frame.pixelBorders then
+	if frame.pixelBorders and skip ~= 'ElvUI' then
 		frame.pixelBorders.CENTER:SetVertexColor(r, g, b, a)
 		frame:SetBackdropColor(r, g, b, 0, 'ElvUI')
 	end
@@ -191,7 +189,7 @@ local function SetTemplate(f, t, glossTex, ignoreUpdates, forcePixelMode, isUnit
 	if t == 'NoBackdrop' then
 		customSetBackdrop(f)
 	else
-		customSetBackdrop(f, true, glossTex and (type(glossTex) == 'string' and glossTex or E.media.glossTex) or E.media.blankTex, E.mult)
+		customSetBackdrop(f, true, glossTex and (type(glossTex) == 'string' and glossTex or E.media.glossTex) or E.media.blankTex, (not E.twoPixelsPlease and E.mult) or E.mult*2)
 
 		if not f.ignoreBackdropColors then
 			if t == 'Transparent' then

ElvUI/ElvUI.toc

 ## Interface: 80100
 ## Author: Elv
-## Version: 11.03
+## Version: 11.04
 ## Title: |cfffe7b2cElvUI|r
 ## Notes: User Interface replacement AddOn for World of Warcraft.
 ## SavedVariables: ElvDB, ElvPrivateDB

ElvUI/Modules/Nameplates/Nameplates.lua

@@ -554,6 +554,7 @@ function NP:Initialize()
 	_G.ElvNP_TargetClassPower.frameType = 'TARGET'
 	_G.ElvNP_TargetClassPower:SetAttribute('toggleForVehicle', true)
 	_G.ElvNP_TargetClassPower:SetAlpha(0)
+	_G.ElvNP_TargetClassPower:EnableMouse(false)
 
 	local NamePlatesCVars = {
 		['nameplateClassResourceTopInset'] = GetCVarDefault('nameplateClassResourceTopInset'),

ElvUI/Settings/Global.lua

@@ -3,7 +3,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
 --Global Settings
 G.general = {
 	UIScale = 0.64,
-	version = 11.03,
+	version = 11.04,
 	eyefinity = false,
 	smallerWorldMap = true,
 	smallerWorldMapScale = 0.9,

ElvUI/init.lua

@@ -146,8 +146,9 @@ function AddOn:OnInitialize()
 		end
 	end
 
+	self.twoPixelsPlease = false
 	self.ScanTooltip = CreateFrame("GameTooltip", "ElvUI_ScanTooltip", _G.UIParent, "GameTooltipTemplate")
-	self.PixelMode = self.private.general.pixelPerfect -- keep this over `UIScale`
+	self.PixelMode = self.twoPixelsPlease or self.private.general.pixelPerfect -- keep this over `UIScale`
 	self:UIScale(true)
 	self:UpdateMedia()
 	self:RegisterEvent('PLAYER_REGEN_DISABLED')