MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backwards options for cycle hotkey working

develop
John Cosker 2023-02-06 08:55:46 -05:00
parent 032b62dcbe
commit d7d6c5aea6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/lua/gui/widgets.lua
Unescape Escape View File

@ -1440,6 +1440,7 @@ CycleHotkeyLabel = defclass(CycleHotkeyLabel, Label)
CycleHotkeyLabel.ATTRS{ CycleHotkeyLabel.ATTRS{
key=DEFAULT_NIL, key=DEFAULT_NIL,
key_back=DEFAULT_NIL,
label=DEFAULT_NIL, label=DEFAULT_NIL,
label_width=DEFAULT_NIL, label_width=DEFAULT_NIL,
options=DEFAULT_NIL, options=DEFAULT_NIL,
@ -1451,7 +1452,8 @@ function CycleHotkeyLabel:init()
self:setOption(self.initial_option) self:setOption(self.initial_option)
self:setText{ self:setText{
{key=self.key, key_sep=': ', text=self.label, width=self.label_width, {key=self.key_back, key_sep='', width=0, on_activate=self.key_back and self:callback('cycle', true)},
{key=self.key, key_sep=self.key_back and '' or ': ', text=self.label, width=self.key_back and 0 or self.label_width,
on_activate=self:callback('cycle')}, on_activate=self:callback('cycle')},
' ', ' ',
{text=self:callback('getOptionLabel'), {text=self:callback('getOptionLabel'),
@ -1459,12 +1461,14 @@ function CycleHotkeyLabel:init()
} }
end end
function CycleHotkeyLabel:cycle() function CycleHotkeyLabel:cycle(backwards)
local old_option_idx = self.option_idx local old_option_idx = self.option_idx
if self.option_idx == #self.options then if self.option_idx == #self.options and not backwards then
self.option_idx = 1 self.option_idx = 1
elseif self.option_idx == 1 and backwards then
self.option_idx = #self.options
else else
self.option_idx = self.option_idx + 1 self.option_idx = self.option_idx + (not backwards and 1 or -1)
end end
if self.on_change then if self.on_change then
self.on_change(self:getOptionValue(), self.on_change(self:getOptionValue(),