1.4.2

Author: Adaptvx

Code/MapPin/MapPin.lua

@@ -31,12 +31,6 @@ local SessionData = {
     flags = nil
 }
 
-local MUTED_FLAG_MAP = {
-    ["TomTom_Waypoint"]       = true,
-    ["Dugis_Waypoint"]        = true,
-    ["SilverDragon_Waypoint"] = true
-}
-
 local function PlayUserNavigationAudio()
     local Settings_CustomAudio = Config.DBGlobal:GetVariable("AudioCustom")
     local soundID = env.Enum.Sound.NewUserNavigation
@@ -159,27 +153,12 @@ function MapPin.IsUserNavigationFlagged(flag)
     return false
 end
 
--- function MapPin.ToggleSuperTrackedPinDisplay(shown)
---     for pin in WorldMapFrame:EnumeratePinsByTemplate("WaypointLocationPinTemplate") do
---         pin:SetAlpha(shown and 1 or 0)
---         pin:EnableMouse(shown)
---     end
--- end
-
 function MapPin.ValidateSuperTrackedPinDisplay(_, event)
     if event == "USER_WAYPOINT_UPDATED" and IsSuperTrackingUserWaypoint() and not MapPin.IsUserNavigationTracked() then
         MapPin.ClearUserNavigation(true)
     elseif event == "SUPER_TRACKING_CHANGED" and C_SuperTrack.GetHighestPrioritySuperTrackingType() ~= Enum.SuperTrackingType.UserWaypoint then
         MapPin.ClearUserNavigation(true)
     end
-
-    -- for flag, _ in pairs(MUTED_FLAG_MAP) do
-    --     if MapPin.IsUserNavigationTracked() and MapPin.IsUserNavigationFlagged(flag) then
-    --         MapPin.ToggleSuperTrackedPinDisplay(false)
-    --         return
-    --     end
-    -- end
-    -- MapPin.ToggleSuperTrackedPinDisplay(true)
 end
 
 do --Automatically clear supertracking when the user waypoint is removed

Code/Settings/Settings_Constructor.lua

@@ -434,7 +434,7 @@ do -- Selection Menu
             value = self.__selectionMenuGetFunc(value)
         end
 
-        self:GetButtonSelectionMenu():SetValue(value)
+        self:GetSelectionMenuButton():SetValue(value)
     end
 
     local function SelectionMenu_OnValueChanged(self, value)
@@ -467,24 +467,24 @@ do -- Selection Menu
 
 
         local widget = Settings_Widgets.ElementSelectionMenu()
-        local buttonSelectionMenu = widget:GetButtonSelectionMenu()
+        local selectionMenuButton = widget:GetSelectionMenuButton()
         widget:parent(parent)
         Mixin(widget, WidgetMixin)
         widget:OnLoad(widgetInfo, root, tab)
-        widget:SetUserInteractableObject(widget:GetButtonSelectionMenu())
+        widget:SetUserInteractableObject(widget:GetSelectionMenuButton())
 
 
         widget:SetDBKey(key)
         widget:PullDBKeyToLocalValue()
 
-        buttonSelectionMenu.__widgetRef = widget
+        selectionMenuButton.__widgetRef = widget
         widget.__setFunc = set
         widget.__selectionMenuGetFunc = selectionMenuGet
         widget.__selectionMenuSetFunc = selectionMenuSet
 
-        buttonSelectionMenu:SetSelectionMenu(SettingFrame.SelectionMenu)
-        buttonSelectionMenu:SetData(ResolveValueThatIsFunctionOrValue(selectionMenuData))
-        buttonSelectionMenu:HookValueChanged(SelectionMenu_OnValueChanged)
+        selectionMenuButton:SetSelectionMenu(SettingFrame.SelectionMenu)
+        selectionMenuButton:SetData(ResolveValueThatIsFunctionOrValue(selectionMenuData))
+        selectionMenuButton:HookValueChanged(SelectionMenu_OnValueChanged)
         widget:SetRefreshHandler(SelectionMenu_Refresh)
 
         return widget

Code/Settings/Settings_Widgets.lua

@@ -601,7 +601,7 @@ do -- Widgets
         Settings_Widgets.ElementButton = UIKit.Template(function(id, name, children, ...)
             local frame =
                 Settings_Widgets.ElementBase(name, {
-                    UICCommon.ButtonRedWithText(name .. ".Button")
+                    UICCommon.RedTextButton(name .. ".Button")
                         :id("Button", id)
                         :point(UIKit.Enum.Point.Right)
                         :size(ACTION_SIZE_750, ACTION_SIZE_125)
@@ -642,20 +642,20 @@ do -- Widgets
     do -- Element (Option Button)
         local ElementSelectionMenuMixin = {}
 
-        function ElementSelectionMenuMixin:GetButtonSelectionMenu()
-            return self.ButtonSelectionMenu
+        function ElementSelectionMenuMixin:GetSelectionMenuButton()
+            return self.SelectionMenuButton
         end
 
         Settings_Widgets.ElementSelectionMenu = UIKit.Template(function(id, name, children, ...)
             local frame =
                 Settings_Widgets.ElementBase(name, {
-                    UICCommon.ButtonSelectionMenu(name .. ".ButtonSelectionMenu")
-                        :id("ButtonSelectionMenu", id)
+                    UICCommon.SelectionMenuButton(name .. ".SelectionMenuButton")
+                        :id("SelectionMenuButton", id)
                         :point(UIKit.Enum.Point.Right)
                         :size(ACTION_SIZE_500, ACTION_SIZE_125)
                 })
 
-            frame.ButtonSelectionMenu = UIKit.GetElementById("ButtonSelectionMenu", id)
+            frame.SelectionMenuButton = UIKit.GetElementById("SelectionMenuButton", id)
 
             Mixin(frame, ElementSelectionMenuMixin)
 

Code/Waypoint/Waypoint.lua

@@ -206,10 +206,10 @@ end
 
 WaypointMixin.AnimGroup = UIAnim.New()
 do
-    local function ApplyDefaultState(WUIWaypointFrame)
-        WUIWaypointFrame.ContextIcon:SetScale(1)
-        WUIWaypointFrame.Beam.Mask:SetScale(50)
-        WUIWaypointFrame.AnimGroup_Beam:Play("NORMAL", WUIWaypointFrame.Beam.FXMask)
+    local function ApplyDefaultState(frame)
+        frame.ContextIcon:SetScale(1)
+        frame.Beam.Mask:SetScale(50)
+        frame.AnimGroup_Beam:Play("NORMAL", frame.Beam.FXMask)
     end
 
     WaypointMixin.AnimGroup:State("INSTANT", function(frame)
@@ -378,7 +378,7 @@ function PinpointMixin:UpdateSize()
 end
 
 function PinpointMixin:UpdateOpacity()
-    self:SetAlpha(Config.DBGlobal:GetVariable("PinpointAlpha") or 1)
+    self.Container:SetAlpha(Config.DBGlobal:GetVariable("PinpointAlpha") or 1)
 end
 
 function PinpointMixin:SetIcon(UIContextIconTexture)
@@ -407,7 +407,7 @@ end
 PinpointMixin.AnimGroup = UIAnim.New()
 do
     local function ApplyDefaultState(frame)
-        frame.Container:SetAlpha(1)
+        frame:SetAlpha(1)
         frame.Background.Arrow:Play()
     end
 
@@ -461,11 +461,11 @@ do
         :to(1)
 
     PinpointMixin.AnimGroup_Hover:State("ENABLED", function(frame)
-        Enabled:Play(frame.Container)
+        Enabled:Play(frame)
     end)
 
     PinpointMixin.AnimGroup_Hover:State("DISABLED", function(frame)
-        Disabled:Play(frame.Container)
+        Disabled:Play(frame)
     end)
 end
 
@@ -615,7 +615,7 @@ function NavigatorMixin:UpdateSize()
 end
 
 function NavigatorMixin:UpdateOpacity()
-    self:SetAlpha(Config.DBGlobal:GetVariable("NavigatorAlpha") or 1)
+    self.Container:SetAlpha(Config.DBGlobal:GetVariable("NavigatorAlpha") or 1)
 end
 
 function NavigatorMixin:SetIcon(UIContextIconTexture)
@@ -673,11 +673,11 @@ do
         :to(1)
 
     NavigatorMixin.AnimGroup_Hover:State("ENABLED", function(frame)
-        Enabled:Play(frame.Container)
+        Enabled:Play(frame)
     end)
 
     NavigatorMixin.AnimGroup_Hover:State("DISABLED", function(frame)
-        Disabled:Play(frame.Container)
+        Disabled:Play(frame)
     end)
 end
 
@@ -703,10 +703,10 @@ function Waypoint.GetTintColorInfo(ContextIconTexture)
 
     local useCustomColor = (DBGlobal:GetVariable("CustomColor") == true)
 
-    local questIncomplete = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestIncomplete"))) or (env.Enum.ColorRGB01.QuestIncomplete)
-    local questComplete = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestComplete"))) or (env.Enum.ColorRGB01.QuestNormal)
-    local questCompleteRecurring = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestCompleteRepeatable"))) or (env.Enum.ColorRGB01.QuestRepeatable)
-    local questCompleteImportant = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestCompleteImportant"))) or (env.Enum.ColorRGB01.QuestImportant)
+    local questIncomplete = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestIncomplete"))) or (env.Enum.ColorRGB01.IncompleteQuest)
+    local questComplete = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestComplete"))) or (env.Enum.ColorRGB01.NormalQuest)
+    local questCompleteRecurring = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestCompleteRepeatable"))) or (env.Enum.ColorRGB01.RepeatableQuest)
+    local questCompleteImportant = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorQuestCompleteImportant"))) or (env.Enum.ColorRGB01.ImportantQuest)
     local other = (useCustomColor and ResolveColorIntegrity(DBGlobal:GetVariable("CustomColorOther"))) or (env.Enum.ColorRGB01.Other)
 
     local recolorQuestIncomplete = (useCustomColor and DBGlobal:GetVariable("CustomColorQuestIncompleteTint")) or (not useCustomColor and false)
@@ -730,16 +730,16 @@ function Waypoint.GetTintColorInfo(ContextIconTexture)
             a = 1
         }
         recolor = requestRecolor or false
-    elseif trackingType == Waypoint_Enum.TrackingType.QuestComplete then
+    elseif trackingType == Waypoint_Enum.TrackingType.CompleteQuest then
         color = questComplete
         recolor = requestRecolor or recolorQuestComplete
-    elseif trackingType == Waypoint_Enum.TrackingType.QuestCompleteRecurring then
+    elseif trackingType == Waypoint_Enum.TrackingType.CompleteRepeatableQuest then
         color = questCompleteRecurring
         recolor = requestRecolor or recolorQuestCompleteRecurring
-    elseif trackingType == Waypoint_Enum.TrackingType.QuestCompleteImportant then
+    elseif trackingType == Waypoint_Enum.TrackingType.CompleteImportantQuest then
         color = questCompleteImportant
         recolor = requestRecolor or recolorQuestCompleteImportant
-    elseif trackingType == Waypoint_Enum.TrackingType.QuestIncomplete then
+    elseif trackingType == Waypoint_Enum.TrackingType.IncompleteQuest then
         color = questIncomplete
         recolor = requestRecolor or recolorQuestIncomplete
     else

Code/Waypoint/Waypoint_DataProvider.lua

@@ -53,15 +53,15 @@ do
         local questID = Waypoint_Cache.Get("questID")
         if questID then
             if not IsComplete(questID) then
-                return Waypoint_Enum.TrackingType.QuestIncomplete
+                return Waypoint_Enum.TrackingType.IncompleteQuest
             end
             local classification = GetQuestClassification(questID)
-            if classification == Enum.QuestClassification.Recurring or classification == Enum.QuestClassification.Meta then
-                return Waypoint_Enum.TrackingType.QuestCompleteRecurring
+            if classification == Enum.QuestClassification.Recurring or classification == Enum.QuestClassification.Meta or classification == Enum.QuestClassification.Calling then
+                return Waypoint_Enum.TrackingType.CompleteRepeatableQuest
             elseif classification == Enum.QuestClassification.Important then
-                return Waypoint_Enum.TrackingType.QuestCompleteImportant
+                return Waypoint_Enum.TrackingType.CompleteImportantQuest
             end
-            return Waypoint_Enum.TrackingType.QuestComplete
+            return Waypoint_Enum.TrackingType.CompleteQuest
         end
         if Waypoint_Cache.Get("pinType") == Enum.SuperTrackingType.Corpse then
             return Waypoint_Enum.TrackingType.Corpse

Code/Waypoint/Waypoint_Enum.lua

@@ -9,12 +9,12 @@ Waypoint_Enum.NavigationMode = {
 }
 
 Waypoint_Enum.TrackingType = {
-    QuestCompleteRecurring = 1,
-    QuestCompleteImportant = 2,
-    QuestComplete          = 3,
-    QuestIncomplete        = 4,
-    Corpse                 = 5,
-    Other                  = 6
+    CompleteRepeatableQuest = 1,
+    CompleteImportantQuest  = 2,
+    CompleteQuest           = 3,
+    IncompleteQuest         = 4,
+    Corpse                  = 5,
+    Other                   = 6
 }
 
 Waypoint_Enum.State = {

Preload.lua

@@ -16,8 +16,8 @@ local IsAddOnLoaded = C_AddOns.IsAddOnLoaded
 env.NAME = "Waypoint UI"
 env.LOGO = Path.Root .. "\\Art\\Icons\\Logo"
 env.LOGO_ALT = Path.Root .. "\\Art\\Icons\\Logo-White"
-env.VERSION_STRING = "1.4.1"
-env.VERSION_NUMBER = 010401
+env.VERSION_STRING = "1.4.2"
+env.VERSION_NUMBER = 010402
 env.DEBUG_MODE = false
 
 
@@ -28,18 +28,18 @@ local Enum = {}; env.Enum = Enum
 do
     Enum.ColorRGB01 = {
         Other           = { r = 255 / 255, g = 241 / 255, b = 180 / 255 },
-        QuestNormal     = { r = 255 / 255, g = 255 / 255, b = 156 / 255 },
-        QuestRepeatable = { r = 158 / 255, g = 207 / 255, b = 245 / 255 },
-        QuestImportant  = { r = 249 / 255, g = 196 / 255, b = 255 / 255 },
-        QuestIncomplete = { r = 200 / 255, g = 200 / 255, b = 200 / 255 }
+        NormalQuest     = { r = 255 / 255, g = 255 / 255, b = 156 / 255 },
+        RepeatableQuest = { r = 158 / 255, g = 207 / 255, b = 245 / 255 },
+        ImportantQuest  = { r = 249 / 255, g = 196 / 255, b = 255 / 255 },
+        IncompleteQuest = { r = 200 / 255, g = 200 / 255, b = 200 / 255 }
     }
 
     Enum.ColorHEX = {
         Other           = "|cffFFF1B4",
-        QuestNormal     = "|cffFFEC9C",
-        QuestRepeatable = "|cff9ECFF5",
-        QuestImportant  = "|cffF9C4FF",
-        QuestIncomplete = "|cffE1E1E1"
+        NormalQuest     = "|cffFFEC9C",
+        RepeatableQuest = "|cff9ECFF5",
+        ImportantQuest  = "|cffF9C4FF",
+        IncompleteQuest = "|cffE1E1E1"
     }
 
     Enum.Sound = {
@@ -96,13 +96,13 @@ do
         NavigatorDistance                      = 1,
         NavigatorDynamicDistance               = true,
         CustomColor                            = false,
-        CustomColorQuestIncomplete             = { r = Enum.ColorRGB01.QuestIncomplete.r, g = Enum.ColorRGB01.QuestIncomplete.g, b = Enum.ColorRGB01.QuestIncomplete.b, a = 1 },
+        CustomColorQuestIncomplete             = { r = Enum.ColorRGB01.IncompleteQuest.r, g = Enum.ColorRGB01.IncompleteQuest.g, b = Enum.ColorRGB01.IncompleteQuest.b, a = 1 },
         CustomColorQuestIncompleteTint         = false,
-        CustomColorQuestComplete               = { r = Enum.ColorRGB01.QuestNormal.r, g = Enum.ColorRGB01.QuestNormal.g, b = Enum.ColorRGB01.QuestNormal.b, a = 1 },
+        CustomColorQuestComplete               = { r = Enum.ColorRGB01.NormalQuest.r, g = Enum.ColorRGB01.NormalQuest.g, b = Enum.ColorRGB01.NormalQuest.b, a = 1 },
         CustomColorQuestCompleteTint           = false,
-        CustomColorQuestCompleteRepeatable     = { r = Enum.ColorRGB01.QuestRepeatable.r, g = Enum.ColorRGB01.QuestRepeatable.g, b = Enum.ColorRGB01.QuestRepeatable.b, a = 1 },
+        CustomColorQuestCompleteRepeatable     = { r = Enum.ColorRGB01.RepeatableQuest.r, g = Enum.ColorRGB01.RepeatableQuest.g, b = Enum.ColorRGB01.RepeatableQuest.b, a = 1 },
         CustomColorQuestCompleteRepeatableTint = false,
-        CustomColorQuestCompleteImportant      = { r = Enum.ColorRGB01.QuestImportant.r, g = Enum.ColorRGB01.QuestImportant.g, b = Enum.ColorRGB01.QuestImportant.b, a = 1 },
+        CustomColorQuestCompleteImportant      = { r = Enum.ColorRGB01.ImportantQuest.r, g = Enum.ColorRGB01.ImportantQuest.g, b = Enum.ColorRGB01.ImportantQuest.b, a = 1 },
         CustomColorQuestCompleteImportantTint  = false,
         CustomColorOther                       = { r = Enum.ColorRGB01.Other.r, g = Enum.ColorRGB01.Other.g, b = Enum.ColorRGB01.Other.b, a = 1 },
         CustomColorOtherTint                   = false,

WaypointUI.toc

@@ -1,5 +1,5 @@
 ## Interface: 120001, 120005
-## Version: 1.4.1
+## Version: 1.4.2
 ## Title: Waypoint UI
 ## Notes: An in-world waypoint and pinpoint to show relevant information directly in world-space.
 ## Notes-zhCN: 魔兽世界中的路径点和标记点，用于在虚拟空间中直接显示相关信息。

packages/uic-common/index.lua

@@ -9,14 +9,14 @@ local UICCommonColorInput = env.modules:Import("packages\\uic-common\\color-inpu
 local UICCommonPrompt = env.modules:Import("packages\\uic-common\\prompt")
 local UICCommon = env.modules:New("packages\\uic-common")
 
-UICCommon.ButtonRed = UICCommonButton.RedBase
-UICCommon.ButtonGray = UICCommonButton.GrayBase
-UICCommon.ButtonRedSquare = UICCommonButton.RedBaseSquare
-UICCommon.ButtonGraySquare = UICCommonButton.GrayBaseSquare
-UICCommon.ButtonRedWithText = UICCommonButton.RedWithText
-UICCommon.ButtonGrayWithText = UICCommonButton.GrayWithText
-UICCommon.ButtonRedClose = UICCommonButton.RedClose
-UICCommon.ButtonSelectionMenu = UICCommonButton.SelectionMenu
+UICCommon.RedButton = UICCommonButton.RedButton
+UICCommon.GrayButton = UICCommonButton.GrayButton
+UICCommon.RedCompactButton = UICCommonButton.RedCompactButton
+UICCommon.GrayCompactButton = UICCommonButton.GrayCompactButton
+UICCommon.RedTextButton = UICCommonButton.RedTextButton
+UICCommon.GrayTextButton = UICCommonButton.GrayTextButton
+UICCommon.RedCloseButton = UICCommonButton.RedCloseButton
+UICCommon.SelectionMenuButton = UICCommonButton.SelectionMenuButton
 UICCommon.CheckButton = UICCommonCheckButton.New
 UICCommon.ScrollBar = UICCommonScrollBar.New
 UICCommon.Input = UICCommonInput.New