diff --git a/.vscode/settings.json b/.vscode/settings.json index 39687679..e7d03693 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -402,7 +402,10 @@ "MAX_ARENA_ENEMIES", "RAID_CLASS_COLORS", "ShowUIPanel", - "MAX_RAID_MEMBERS" + "MAX_RAID_MEMBERS", + "QueueStatusButton", + "WeeklyRewardsFrame", + "UIParentLoadAddOn" ], "Lua.workspace.ignoreDir": [".vscode", "libs/*"], "Lua.diagnostics.enable": true, @@ -429,6 +432,6 @@ "utf8": "disable" }, "Lua.workspace.library": [ - "~\\.vscode\\extensions\\ketho.wow-api-0.17.4\\Annotations" + "~\\.vscode\\extensions\\ketho.wow-api-0.17.6\\Annotations" ] } diff --git a/Modules/Minimap.lua b/Modules/Minimap.lua index f7bccc5c..ec33582d 100644 --- a/Modules/Minimap.lua +++ b/Modules/Minimap.lua @@ -37,17 +37,33 @@ local BaseSettings = { } local IsMouseOver = function() - local MouseFocus = GetMouseFocus() - if - MouseFocus - and not MouseFocus:IsForbidden() - and ((MouseFocus:GetName() == 'Minimap') or (MouseFocus:GetParent() and MouseFocus:GetParent():GetName() and MouseFocus:GetParent():GetName():find('Mini[Mm]ap'))) - then - MouseIsOver = true + if GetMouseFoci then + for _, MouseFocus in ipairs(GetMouseFoci()) do + if + MouseFocus + and not MouseFocus:IsForbidden() + and ((MouseFocus:GetName() == 'Minimap') or (MouseFocus:GetParent() and MouseFocus:GetParent():GetName() and MouseFocus:GetParent():GetName():find('Mini[Mm]ap'))) + then + return true + end + end + + return false else - MouseIsOver = false + local MouseFocus = GetMouseFocus() + if + MouseFocus + and not MouseFocus:IsForbidden() + and ((MouseFocus:GetName() == 'Minimap') or (MouseFocus:GetParent() and MouseFocus:GetParent():GetName() and MouseFocus:GetParent():GetName():find('Mini[Mm]ap'))) + then + MouseIsOver = true + else + MouseIsOver = false + end + return MouseIsOver end - return MouseIsOver + -- We really should not get here but, just in case + return true end local isFrameIgnored = function(item) diff --git a/SpartanUI_Vanilla.toc b/SpartanUI_Vanilla.toc index 354a192a..b0d365fc 100644 --- a/SpartanUI_Vanilla.toc +++ b/SpartanUI_Vanilla.toc @@ -1,4 +1,4 @@ -## Interface: 11503 +## Interface: 11504 ## Title: Spartan|cffe21f1fUI ## Notes: User Interface combining elegant artwork with well designed features. ## Version: @project-version@