Skip to content

Fix bottom bar wrapping in the tree tab #4693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 8, 2022
Merged

Fix bottom bar wrapping in the tree tab #4693

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9968441
Set default of treeHeatMapStatSelect to be hidden
talkmill Aug 7, 2022
5843652
Added offset to calculate wrapping
talkmill Aug 7, 2022
f284d05
Made sure treeheatmapselect starts shown/hidden
talkmill Aug 7, 2022
18ae99d
cleanup the offset calculation
talkmill Aug 7, 2022
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
3 changes: 2 additions & 1 deletion src/Classes/TreeTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function TreeTabClass:Draw(viewPort, inputEvents)

-- Determine positions if one line of controls doesn't fit in the screen width
local twoLineHeight = 24
if viewPort.width >= 1484 or (viewPort.width >= 1168 and not self.viewer.showHeatMap) then
if viewPort.width >= 1168 + (self.isComparing and 198 or 0) + (self.viewer.showHeatMap and 316 or 0) then
twoLineHeight = 0
self.controls.findTimelessJewel:SetAnchor("LEFT", self.controls.treeSearch, "RIGHT", 8, 0)
if self.controls.powerReportList then
Expand Down Expand Up @@ -245,6 +245,7 @@ function TreeTabClass:Draw(viewPort, inputEvents)
end

self.controls.treeHeatMap.state = self.viewer.showHeatMap
self.controls.treeHeatMapStatSelect.shown = self.viewer.showHeatMap
self.controls.treeHeatMapStatSelect.list = self.powerStatList
self.controls.treeHeatMapStatSelect.selIndex = 1
self.controls.treeHeatMapStatSelect:CheckDroppedWidth(true)
Expand Down