Skip to content

Commit b121fe2

Browse files
83N17083N170
authored andcommitted
Fix issue with mouse wheel not scrolling the whole sheet
1 parent 77ff94f commit b121fe2

1 file changed

Lines changed: 33 additions & 27 deletions

File tree

gui/manipulator.lua

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,9 @@ function Spreadsheet:init()
588588
goals_by_type[df.goal_type.CRAFT_A_MASTERWORK] = { value = 15, name = "Craft"..string.char(15), pen = COLOR_LIGHTRED, pen_achieved = COLOR_LIGHTGREEN }
589589

590590
local goals_by_value = {}
591-
for _, v in ipairs(goals_by_type) do
592-
goals_by_value[v.value] = v
593-
end
591+
for _, v in ipairs(goals_by_type) do
592+
goals_by_value[v.value] = v
593+
end
594594

595595

596596
local cols = Cols{}
@@ -609,6 +609,7 @@ function Spreadsheet:init()
609609
end,
610610
},
611611
DataColumn{
612+
view_id='stress',
612613
group='summary',
613614
label='Stress',
614615
shared=self.shared,
@@ -649,6 +650,7 @@ function Spreadsheet:init()
649650
end,
650651
},
651652
DataColumn{
653+
view_id='arrival',
652654
group='summary',
653655
label='Arrival',
654656
shared=self.shared,
@@ -695,34 +697,35 @@ function Spreadsheet:init()
695697
end,
696698
},
697699
DataColumn{
698-
group='summary',
699-
label='Goal',
700-
shared=self.shared,
701-
data_width=8,
702-
data_fn=function(unit)
700+
view_id='goal',
701+
group='summary',
702+
label='Goal',
703+
shared=self.shared,
704+
data_width=8,
705+
data_fn=function(unit)
703706
local goal = #unit.status.current_soul.personality.dreams > 0 and unit.status.current_soul.personality.dreams[0].type or df.goal_type.MAINTAIN_ENTITY_STATUS
704707
local isAchieved = #unit.status.current_soul.personality.dreams > 0 and unit.status.current_soul.personality.dreams[0].flags.accomplished and 1 or -1
705708
return isAchieved * (goals_by_type[goal].value or 1)
706709
end,
707-
choice_fn=function(get_ordered_data_fn)
708-
return {
709-
text={
710-
{
711-
text=function()
712-
local ordered_data = get_ordered_data_fn()
713-
local goal_index = math.abs(ordered_data)
714-
return goals_by_value[goal_index].name
715-
end,
716-
pen=function()
717-
local ordered_data = get_ordered_data_fn()
718-
local isAchieved = ordered_data > 0
719-
local goal_index = math.abs(ordered_data)
720-
return isAchieved and goals_by_value[goal_index].pen_achieved or goals_by_value[goal_index].pen
721-
end,
710+
choice_fn=function(get_ordered_data_fn)
711+
return {
712+
text={
713+
{
714+
text=function()
715+
local ordered_data = get_ordered_data_fn()
716+
local goal_index = math.abs(ordered_data)
717+
return goals_by_value[goal_index].name
718+
end,
719+
pen=function()
720+
local ordered_data = get_ordered_data_fn()
721+
local isAchieved = ordered_data > 0
722+
local goal_index = math.abs(ordered_data)
723+
return isAchieved and goals_by_value[goal_index].pen_achieved or goals_by_value[goal_index].pen
724+
end,
725+
},
722726
},
723-
},
724-
}
725-
end,
727+
}
728+
end,
726729
}
727730
}
728731

@@ -731,6 +734,7 @@ function Spreadsheet:init()
731734
if caption then
732735
cols:addviews{
733736
DataColumn{
737+
view_id=caption:lower(),
734738
group='skills',
735739
label=caption,
736740
shared=self.shared,
@@ -746,6 +750,7 @@ function Spreadsheet:init()
746750
for _, wd in ipairs(work_details) do
747751
cols:addviews{
748752
ToggleColumn{
753+
view_id=wd.name:lower(),
749754
group='work details',
750755
label=wd.name,
751756
shared=self.shared,
@@ -763,6 +768,7 @@ function Spreadsheet:init()
763768
for _, bld in ipairs(vec) do
764769
cols:addviews{
765770
ToggleColumn{
771+
view_id=get_workshop_label(bld, type_enum, type_defs):lower(),
766772
group='workshops',
767773
label=get_workshop_label(bld, type_enum, type_defs),
768774
shared=self.shared,
@@ -1060,7 +1066,7 @@ function Spreadsheet:render(dc)
10601066
local selected = self.namelist:getSelected()
10611067
for _, col in ipairs(self.cols.subviews) do
10621068
col.subviews.col_list.page_top = page_top
1063-
col.subviews.col_list:setSelected(selected)
1069+
col.subviews.col_list.selected = selected
10641070
end
10651071
Spreadsheet.super.render(self, dc)
10661072
self.shared.cache = {}

0 commit comments

Comments
 (0)