diff --git a/src/Classes/CompareTab.lua b/src/Classes/CompareTab.lua index 7682fe7b02d..18aba1c1cda 100644 --- a/src/Classes/CompareTab.lua +++ b/src/Classes/CompareTab.lua @@ -1870,12 +1870,10 @@ end -- ============================================================ function CompareTabClass:DrawControlList(viewPort, controls) - local noTooltip = function(control) - return self.selControl and self.selControl.hasFocus and self.selControl ~= control - end + local blocker = self:GetTooltipBlocker() for _, control in ipairs(controls) do if control:IsShown() and control.Draw then - control:Draw(viewPort, noTooltip(control)) + control:Draw(viewPort, blocker and blocker ~= control) end end end diff --git a/src/Classes/ControlHost.lua b/src/Classes/ControlHost.lua index 83563f758b4..8df0f895a8f 100644 --- a/src/Classes/ControlHost.lua +++ b/src/Classes/ControlHost.lua @@ -106,10 +106,23 @@ function ControlHostClass:ProcessControlsInput(inputEvents, viewPort) end end +-- A focused control only hides other tooltips while it is hovered or dropped down, so they can't overlap +local function getTooltipBlocker(control) + if control and control.hasFocus and (control.dropped or not control.IsMouseOver or control:IsMouseOver()) then + return control + end +end + +function ControlHostClass:GetTooltipBlocker() + return getTooltipBlocker(self.selControl) +end + function ControlHostClass:DrawControls(viewPort, selControl) + local blocker = getTooltipBlocker(self.selControl) + local outerBlocker = getTooltipBlocker(selControl) for _, control in pairs(self.controls) do if control:IsShown() and control.Draw then - control:Draw(viewPort, (self.selControl and self.selControl.hasFocus and self.selControl ~= control) or (selControl and selControl.hasFocus and selControl ~= control)) + control:Draw(viewPort, (blocker and blocker ~= control) or (outerBlocker and outerBlocker ~= control)) end end end