Commit d6e0db21 authored by Simpy's avatar Simpy 🐹
Browse files

Merge remote-tracking branch 'elvui/beta' into ptr

parents 56a0979e 4d115cdd
Copyright (c) 2006-2019 Trond A Ekseth <troeks@gmail.com>
Copyright (c) 2016-2019 Val Voronov <i.lightspark@gmail.com>
Copyright (c) 2016-2019 Adrian L Lange <contact@p3lim.net>
Copyright (c) 2016-2019 Rainrider <rainrider.wow@gmail.com>
Copyright (c) 2006-2020 Trond A Ekseth <troeks@gmail.com>
Copyright (c) 2016-2020 Val Voronov <i.lightspark@gmail.com>
Copyright (c) 2016-2020 Adrian L Lange <contact@p3lim.net>
Copyright (c) 2016-2020 Rainrider <rainrider.wow@gmail.com>
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
......
## Interface: 80200
## Interface: 90000
## Title: oUF
## Author: Haste, lightspark, p3lim, Rainrider
## Version: @project-version@
......
......@@ -155,7 +155,11 @@ function M:GetLocTextColor()
end
function M:SetupHybridMinimap()
_G.HybridMinimap.MapCanvas:SetMaskTexture(E.Media.Textures.White8x8)
local MapCanvas = _G.HybridMinimap.MapCanvas
MapCanvas:SetMaskTexture(E.Media.Textures.White8x8)
MapCanvas:SetScript('OnMouseWheel', M.Minimap_OnMouseWheel)
MapCanvas:SetScript('OnMouseDown', M.MapCanvas_OnMouseDown)
MapCanvas:SetScript('OnMouseUp', E.noop)
end
function M:ADDON_LOADED(_, addon)
......@@ -187,6 +191,23 @@ function M:Minimap_OnMouseDown(btn)
end
end
function M:MapCanvas_OnMouseDown(btn)
_G.HideDropDownMenu(1, nil, ElvUIMiniMapTrackingDropDown)
menuFrame:Hide()
local position = self:GetPoint()
if btn == 'MiddleButton' or (btn == 'RightButton' and IsShiftKeyDown()) then
if InCombatLockdown() then _G.UIErrorsFrame:AddMessage(E.InfoColor.._G.ERR_NOT_IN_COMBAT) return end
if position:match('LEFT') then
E:DropDown(menuList, menuFrame)
else
E:DropDown(menuList, menuFrame, -160, 0)
end
elseif btn == 'RightButton' then
_G.ToggleDropDownMenu(1, nil, ElvUIMiniMapTrackingDropDown, 'cursor')
end
end
function M:Minimap_OnMouseWheel(d)
if d > 0 then
_G.MinimapZoomIn:Click()
......
......@@ -274,9 +274,6 @@ function S:CharacterFrame()
Slot:StyleButton(Slot)
Slot.icon:SetInside()
Slot.ignoreTexture:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-LeaveItem-Transparent]])
Slot.CorruptedHighlightTexture:SetAtlas('Nzoth-charactersheet-item-glow')
Slot.IconOverlay:SetAtlas('Nzoth-inventory-icon')
Slot.IconOverlay:SetInside()
S:HandleIconBorder(Slot.IconBorder)
......
......@@ -590,7 +590,7 @@ function S:Blizzard_GarrisonUI()
_G.CovenantMissionFrameMissions.RaisedFrameEdges:SetAlpha(0)
S:HandleIcon(_G.CovenantMissionFrameMissions.MaterialFrame.Icon)
S:HandleScrollBar(_G.CovenantMissionFrameMissionsListScrollFrameScrollBar)
--S:HandleScrollBar(_G.CovenantMissionFrameMissionsListScrollFrameScrollBar) -- Dont skin it, the "NEW" default ones looks amazing
-- Complete Missions
_G.CombatLog.CombatLogMessageFrame:StripTextures()
......@@ -611,6 +611,7 @@ function S:Blizzard_GarrisonUI()
S:HandleFollowerListOnUpdateData('CovenantMissionFrameFollowers')
S:HandleButton(Follower.HealAllButton)
S:HandleButton(_G.HealFollowerButtonTemplate)
-- Mission Tab
......
......@@ -93,12 +93,6 @@ function S:Blizzard_InspectUI()
Slot:StripTextures()
Slot:StyleButton()
S:HandleIconBorder(Slot.IconBorder, Slot.icon.backdrop)
if not Slot.Eye then
Slot.Eye = Slot:CreateTexture()
Slot.Eye:SetAtlas('Nzoth-inventory-icon')
Slot.Eye:SetInside()
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment