diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 4b1211c..0381b71 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -470,6 +470,28 @@ do GameTooltip:Hide() end + local Calendar_OnClick = function(self) + GameTimeFrame:Click(); + end + + local Tracking_OnClick = function(self) + local position = self:GetPoint() + local xoff = -1 + if position:match("RIGHT") then xoff = -16 end + ToggleDropDownMenu(1, nil, MiniMapTrackingDropDown, self, xoff, -3) + end + + local Basic_OnEnter = function(self) + GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT", 0, 4) + GameTooltip:ClearLines() + GameTooltip:AddLine(self.TText, 1, 1, 1) + GameTooltip:Show() + end + + local Basic_OnLeave = function(self) + GameTooltip:Hide() + end + function SetMiniMapCoords() if(not SVUI_MiniMapCoords) then local CoordsHolder = CreateFrame("Frame", "SVUI_MiniMapCoords", Minimap) @@ -477,7 +499,7 @@ do CoordsHolder:SetFrameStrata(Minimap:GetFrameStrata()) CoordsHolder:SetPoint("TOPLEFT", SVUI_MinimapFrame, "BOTTOMLEFT", 0, -4) CoordsHolder:SetPoint("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMRIGHT", 0, -4) - CoordsHolder:SetHeight(17) + CoordsHolder:SetHeight(22) CoordsHolder:EnableMouse(true) CoordsHolder:SetScript("OnEnter",Tour_OnEnter) CoordsHolder:SetScript("OnLeave",Tour_OnLeave) @@ -486,16 +508,42 @@ do CoordsHolder.playerXCoords = CoordsHolder:CreateFontString(nil, "OVERLAY") CoordsHolder.playerXCoords:SetPoint("BOTTOMLEFT", CoordsHolder, "BOTTOMLEFT", 0, 0) CoordsHolder.playerXCoords:SetWidth(70) - CoordsHolder.playerXCoords:SetHeight(17) + CoordsHolder.playerXCoords:SetHeight(22) CoordsHolder.playerXCoords:SetFontTemplate(SuperVillain.Media.font.numbers, 12, "OUTLINE") CoordsHolder.playerXCoords:SetTextColor(cColor.r, cColor.g, cColor.b) CoordsHolder.playerYCoords = CoordsHolder:CreateFontString(nil, "OVERLAY") CoordsHolder.playerYCoords:SetPoint("BOTTOMLEFT", CoordsHolder.playerXCoords, "BOTTOMRIGHT", 4, 0) CoordsHolder.playerXCoords:SetWidth(70) - CoordsHolder.playerYCoords:SetHeight(17) + CoordsHolder.playerYCoords:SetHeight(22) CoordsHolder.playerYCoords:SetFontTemplate(SuperVillain.Media.font.numbers, 12, "OUTLINE") CoordsHolder.playerYCoords:SetTextColor(cColor.r, cColor.g, cColor.b) + + local calendarButton = CreateFrame("Button", "SVUI_CalendarButton", SVUI_MinimapFrame) + calendarButton:SetSize(22,22) + calendarButton:SetPoint("RIGHT", CoordsHolder, "RIGHT", 0, 0) + calendarButton:Formula409() + calendarButton:SetNormalTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-CALENDAR") + calendarButton:SetPushedTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-CALENDAR") + calendarButton:SetHighlightTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-CALENDAR") + calendarButton.TText = "Calendar" + calendarButton:RegisterForClicks("AnyUp") + calendarButton:SetScript("OnEnter", Basic_OnEnter) + calendarButton:SetScript("OnLeave", Basic_OnLeave) + calendarButton:SetScript("OnClick", Calendar_OnClick) + + local trackingButton = CreateFrame("Button", "SVUI_TrackingButton", SVUI_MinimapFrame) + trackingButton:SetSize(22,22) + trackingButton:SetPoint("RIGHT", calendarButton, "LEFT", -4, 0) + trackingButton:Formula409() + trackingButton:SetNormalTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-TRACKING") + trackingButton:SetPushedTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-TRACKING") + trackingButton:SetHighlightTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP-TRACKING") + trackingButton.TText = "Tracking" + trackingButton:RegisterForClicks("AnyUp") + trackingButton:SetScript("OnEnter", Basic_OnEnter) + trackingButton:SetScript("OnLeave", Basic_OnLeave) + trackingButton:SetScript("OnClick", Tracking_OnClick) end end end @@ -821,7 +869,7 @@ function MOD:Load() if(self.db.minimapbar.enable == true) then MMBHolder = CreateFrame("Frame", "SVUI_MiniMapButtonHolder", SVUI_MinimapFrame) - MMBHolder:Point("TOPRIGHT", SVUI_MinimapFrame, "BOTTOMRIGHT", 2, -20) + MMBHolder:Point("TOPRIGHT", SVUI_MiniMapCoords, "BOTTOMRIGHT", 0, -4) MMBHolder:Size(SVUI_MinimapFrame:GetWidth(), 32) MMBHolder:SetFrameStrata("BACKGROUND") MMBBar = CreateFrame("Frame", "SVUI_MiniMapButtonBar", MMBHolder)