From 0cc716340e160a46ddcd44cfb271225115051389 Mon Sep 17 00:00:00 2001 From: Bunny67 Date: Sat, 14 Jul 2018 18:55:27 +0300 Subject: [PATCH] test minimap --- ElvUI/Layout/Layout.lua | 8 ++++---- ElvUI/Modules/Maps/Minimap.lua | 5 ++++- ElvUI/Modules/Tooltip/Tooltip.lua | 4 +--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ElvUI/Layout/Layout.lua b/ElvUI/Layout/Layout.lua index e884bcc..679e1bd 100644 --- a/ElvUI/Layout/Layout.lua +++ b/ElvUI/Layout/Layout.lua @@ -352,16 +352,16 @@ end function LO:CreateMinimapPanels() local lminipanel = CreateFrame("Frame", "LeftMiniPanel", Minimap.backdrop) - lminipanel:SetWidth(E.db.general.minimap.size/2 + (E.PixelMode and 1 or 3)) + lminipanel:SetWidth(E.db.general.minimap.size/2 + 1.5) lminipanel:SetHeight(PANEL_HEIGHT) - lminipanel:SetPoint("TOPLEFT", Minimap, "BOTTOMLEFT", -E.Border, (E.PixelMode and 0 or -3)) + lminipanel:SetPoint("TOPLEFT", Minimap, "BOTTOMLEFT", -E.Border - 1, (E.PixelMode and 0 or -3) + 1) E:SetTemplate(lminipanel, E.db.datatexts.panelTransparency and "Transparent" or "Default", true) E:GetModule("DataTexts"):RegisterPanel(lminipanel, 1, "ANCHOR_BOTTOMLEFT", lminipanel:GetWidth() * 2, -(E.PixelMode and 1 or 3)) local rminipanel = CreateFrame("Frame", "RightMiniPanel", Minimap.backdrop) - rminipanel:SetWidth(E.db.general.minimap.size/2 + (E.PixelMode and 1 or 3)) + rminipanel:SetWidth(E.db.general.minimap.size/2 + 1.5) rminipanel:SetHeight(PANEL_HEIGHT) - rminipanel:SetPoint("TOPRIGHT", Minimap, "BOTTOMRIGHT", E.Border, (E.PixelMode and 0 or -3)) + rminipanel:SetPoint("TOPRIGHT", Minimap, "BOTTOMRIGHT", E.Border - 1, (E.PixelMode and 0 or -3) + 1) E:SetTemplate(rminipanel, E.db.datatexts.panelTransparency and "Transparent" or "Default", true) E:GetModule("DataTexts"):RegisterPanel(rminipanel, 1, "ANCHOR_BOTTOM", 0, -(E.PixelMode and 1 or 3)) diff --git a/ElvUI/Modules/Maps/Minimap.lua b/ElvUI/Modules/Maps/Minimap.lua index a3ac2f5..3d320c6 100644 --- a/ElvUI/Modules/Maps/Minimap.lua +++ b/ElvUI/Modules/Maps/Minimap.lua @@ -118,7 +118,9 @@ function M:UpdateSettings() if LeftMiniPanel and RightMiniPanel then if E.db.datatexts.minimapPanels and E.private.general.minimap.enable then LeftMiniPanel:Show() + LeftMiniPanel:SetWidth(E.db.general.minimap.size/2 + 1.5) RightMiniPanel:Show() + RightMiniPanel:SetWidth(E.db.general.minimap.size/2 + 1.5) else LeftMiniPanel:Hide() RightMiniPanel:Hide() @@ -262,7 +264,8 @@ function M:Initialize() Minimap:SetMaskTexture("Interface\\ChatFrame\\ChatFrameBackground") Minimap.backdrop = CreateFrame("Frame", nil, UIParent) - E:SetOutside(Minimap.backdrop, Minimap) + Minimap.backdrop:SetPoint("TOPLEFT", Minimap, "TOPLEFT", -E.Border - 1, E.Border + 1) + Minimap.backdrop:SetPoint("BOTTOMRIGHT", Minimap, "BOTTOMRIGHT", E.Border - 1, -E.Border + 1) Minimap.backdrop:SetFrameStrata(Minimap:GetFrameStrata()) Minimap.backdrop:SetFrameLevel(Minimap:GetFrameLevel() - 1) E:SetTemplate(Minimap.backdrop, "Default") diff --git a/ElvUI/Modules/Tooltip/Tooltip.lua b/ElvUI/Modules/Tooltip/Tooltip.lua index be5c26a..4988ecc 100644 --- a/ElvUI/Modules/Tooltip/Tooltip.lua +++ b/ElvUI/Modules/Tooltip/Tooltip.lua @@ -1,6 +1,6 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local TT = E:NewModule("Tooltip", "AceHook-3.0", "AceEvent-3.0"); -local LIP = LibStub:GetLibrary("ItemPrice-1.1") +local LIP = LibStub:GetLibrary("ItemPrice-1.1"); --Cache global variables --Lua functions @@ -287,8 +287,6 @@ function TT:SetPrice(tt, id, count) if price and price > 0 then tt:AddDoubleLine(SALE_PRICE_COLON, E:FormatMoney(count and price * count or price, "BLIZZARD", false), nil, nil, nil, 1, 1, 1) end - - if tt:IsShown() then tt:Show() end end function TT:SetAction(tt, id)