Skip to content

Commit 03f013c

Browse files
committed
remove map mods from compared Config and fix gaps between groups
1 parent ddec577 commit 03f013c

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

src/Classes/CompareTab.lua

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ local LAYOUT = {
8383
configColumnHeaderHeight = 20,
8484
configFixedHeaderHeight = 92,
8585
configSectionWidth = 560,
86-
configSectionGap = 18,
86+
configSectionGap = 24,
87+
configSectionColumnGap = 10,
8788
configSectionInnerPad = 20,
8889
configLabelOffset = 10,
8990
configCol2 = 234,
@@ -1127,8 +1128,8 @@ function CompareTabClass:RebuildConfigControls(compareEntry)
11271128
local currentSection = nil
11281129
for _, varData in ipairs(configOptions) do
11291130
if varData.section then
1130-
-- Skip "Custom Modifiers" section
1131-
if varData.section ~= "Custom Modifiers" then
1131+
-- Skip sections not relevant in Compare view
1132+
if varData.section ~= "Custom Modifiers" and varData.section ~= "Map Modifiers and Player Debuffs" then
11321133
currentSection = { name = varData.section, col = varData.col, items = {} }
11331134
t_insert(self.configSections, currentSection)
11341135
else
@@ -1900,6 +1901,7 @@ function CompareTabClass:LayoutConfigView(contentVP, compareEntry)
19001901
local sectionGap = LAYOUT.configSectionGap
19011902
local fixedHeaderHeight = LAYOUT.configFixedHeaderHeight
19021903
local sectionWidth = LAYOUT.configSectionWidth
1904+
local columnStride = sectionWidth + LAYOUT.configSectionColumnGap
19031905
local scrollableH = contentVP.height - fixedHeaderHeight
19041906

19051907
-- Hide ALL config controls first (selectively shown below)
@@ -1957,7 +1959,7 @@ function CompareTabClass:LayoutConfigView(contentVP, compareEntry)
19571959
end
19581960

19591961
-- Second pass: multi-column placement (same algorithm as ConfigTab)
1960-
local maxCol = m_floor((contentVP.width - 10) / sectionWidth)
1962+
local maxCol = m_floor((contentVP.width - 10) / columnStride)
19611963
if maxCol < 1 then maxCol = 1 end
19621964
local colY = { 0 }
19631965
local maxColY = 0
@@ -1968,7 +1970,7 @@ function CompareTabClass:LayoutConfigView(contentVP, compareEntry)
19681970
local col
19691971
-- Try preferred column if it fits
19701972
if sec.col and (colY[sec.col] or 0) + h + 28 <= scrollableH
1971-
and 10 + sec.col * sectionWidth <= contentVP.width then
1973+
and 10 + sec.col * columnStride <= contentVP.width then
19721974
col = sec.col
19731975
else
19741976
-- Find shortest column
@@ -1981,7 +1983,7 @@ function CompareTabClass:LayoutConfigView(contentVP, compareEntry)
19811983
end
19821984
end
19831985
colY[col] = colY[col] or 0
1984-
sec.x = 10 + (col - 1) * sectionWidth
1986+
sec.x = 10 + (col - 1) * columnStride
19851987
sec.y = colY[col] + sectionGap
19861988
colY[col] = colY[col] + h + sectionGap
19871989
maxColY = m_max(maxColY, colY[col])

0 commit comments

Comments
 (0)