Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Classes/CompareTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 14 additions & 1 deletion src/Classes/ControlHost.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading