onyx_online/nvda-voicemeeter
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/nvda-voicemeeter.git synced 2024-11-22 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix events for sliders

Browse Source
This commit is contained in:
onyx-and-iris 2023-09-17 10:18:22 +01:00
parent cf5c8f81aa
commit 3d7b33c8be
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvda_voicemeeter/window.py
View File

@ -194,14 +194,11 @@ class NVDAVMWindow(psg.Window):
# Strip Sliders # Strip Sliders
for i in range(self.kind.num_strip): for i in range(self.kind.num_strip):
for param in ("GAIN", "LIMIT"): for param in util.get_slider_params(i, self.vm) + ("GAIN", "LIMIT"):
if self.kind.name == "basic" and param == "LIMIT": if self.kind.name == "basic" and param == "LIMIT":
continue continue
self[f"STRIP {i}||SLIDER {param}"].bind("<FocusIn>", "||FOCUS IN") self[f"STRIP {i}||SLIDER {param}"].bind("<FocusIn>", "||FOCUS IN")
self[f"STRIP {i}||SLIDER {param}"].bind("<FocusOut>", "||FOCUS OUT") self[f"STRIP {i}||SLIDER {param}"].bind("<FocusOut>", "||FOCUS OUT")
for param in util.get_slider_params(i, self.vm):
self[f"STRIP {i}||SLIDER {param}"].bind("<FocusIn>", "||FOCUS IN")
self[f"STRIP {i}||SLIDER {param}"].bind("<FocusOut>", "||FOCUS OUT")
self[f"STRIP {i}||SLIDER {param}"].bind("<Left>", "||KEY LEFT") self[f"STRIP {i}||SLIDER {param}"].bind("<Left>", "||KEY LEFT")
self[f"STRIP {i}||SLIDER {param}"].bind("<Right>", "||KEY RIGHT") self[f"STRIP {i}||SLIDER {param}"].bind("<Right>", "||KEY RIGHT")
self[f"STRIP {i}||SLIDER {param}"].bind("<Shift-KeyPress-Left>", "||KEY SHIFT LEFT") self[f"STRIP {i}||SLIDER {param}"].bind("<Shift-KeyPress-Left>", "||KEY SHIFT LEFT")
@ -677,8 +674,6 @@ class NVDAVMWindow(psg.Window):
# Strip Sliders # Strip Sliders
case [["STRIP", index], ["SLIDER", "GAIN"]]: case [["STRIP", index], ["SLIDER", "GAIN"]]:
label = self.cache["labels"][f"STRIP {index}||LABEL"] label = self.cache["labels"][f"STRIP {index}||LABEL"]
val = values[event]
self.vm.strip[int(index)].gain = val
self.nvda.speak(f"{label} gain slider {val}") self.nvda.speak(f"{label} gain slider {val}")
case [["STRIP", index], ["SLIDER", "GAIN"], ["FOCUS", "IN"]]: case [["STRIP", index], ["SLIDER", "GAIN"], ["FOCUS", "IN"]]:
if self.find_element_with_focus() is not None: if self.find_element_with_focus() is not None:
@ -696,7 +691,7 @@ class NVDAVMWindow(psg.Window):
case "LEFT" | "DOWN": case "LEFT" | "DOWN":
val -= 1 val -= 1
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12)) self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=util.check_bounds(val, (-60, 12)))
case [ case [
["STRIP", index], ["STRIP", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
@ -709,7 +704,7 @@ class NVDAVMWindow(psg.Window):
case "LEFT" | "DOWN": case "LEFT" | "DOWN":
val -= 3 val -= 3
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12)) self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=util.check_bounds(val, (-60, 12)))
case [ case [
["STRIP", index], ["STRIP", index],
["SLIDER", "GAIN"], ["SLIDER", "GAIN"],
@ -722,7 +717,7 @@ class NVDAVMWindow(psg.Window):
case "LEFT" | "DOWN": case "LEFT" | "DOWN":
val -= 0.1 val -= 0.1
self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12)) self.vm.strip[int(index)].gain = util.check_bounds(val, (-60, 12))
self[f"STRIP {index}||SLIDER GAIN"].update(value=val) self[f"STRIP {index}||SLIDER GAIN"].update(value=util.check_bounds(val, (-60, 12)))
# Bus Params # Bus Params
case [["BUS", index], [param]]: case [["BUS", index], [param]]: