From eb0f1fa5a8ed7ce38380b94d2868f56ef33d5729 Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Thu, 6 May 2021 14:14:03 +0200 Subject: [PATCH] Track all scroll events Further testing reveals we need to catch all scroll events so it works on the phone --- main.py | 12 +++++------- tinge/requirements.txt | 3 +++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 tinge/requirements.txt diff --git a/main.py b/main.py index a71dcae..759e585 100644 --- a/main.py +++ b/main.py @@ -41,12 +41,11 @@ class Hui(wx.Frame): """ func = args[0] - def wrapper(*args, **kwargs): + def wrapper(self, *wrapper_args): """The wrapper function for the decorator """ - self = args[0] self.sizer.Clear(delete_windows=True) - func(*args, **kwargs) + func(self, *wrapper_args) self.sizer.Layout() return wrapper @@ -115,8 +114,7 @@ class Hui(wx.Frame): toggle_btn: wx.Button = wx.Button(self.pnl, label=icon) inner_sizer.Add(toggle_btn, 0, wx.EXPAND) self.Bind(wx.EVT_BUTTON, - lambda event, mlightid=lightid, mlights=lights: self.toggle_light_and_goto_group(mlightid, - mlights), + lambda event, mlightid=lightid: self.toggle_light_and_goto_group(mlightid, lights), toggle_btn) label: str = "{}".format(light) light_btn: wx.Button = wx.Button(self.pnl, label=label) @@ -204,7 +202,7 @@ class Hui(wx.Frame): b_slider: wx.Slider = wx.Slider(self.pnl, value=light.get_state().get_brightness(), minValue=1, maxValue=254) self.sizer.Add(b_slider, 0, wx.EXPAND) - self.Bind(wx.EVT_SCROLL_THUMBRELEASE, + self.Bind(wx.EVT_SCROLL, lambda event: self.set_brightness(event, light.get_id()), b_slider) # Slider for colortemp if is_on and light.can_set_ct(): @@ -212,7 +210,7 @@ class Hui(wx.Frame): self.sizer.Add(c_label, 0, wx.EXPAND) c_slider: wx.Slider = wx.Slider(self.pnl, value=light.get_ct(), minValue=153, maxValue=500) self.sizer.Add(c_slider, 0, wx.EXPAND) - self.Bind(wx.EVT_SCROLL_THUMBRELEASE, + self.Bind(wx.EVT_SCROLL, lambda event: self.set_colortemp(event, light.get_id()), c_slider) def set_brightness(self, event: wx.ScrollEvent, lightid: int): diff --git a/tinge/requirements.txt b/tinge/requirements.txt new file mode 100644 index 0000000..b975717 --- /dev/null +++ b/tinge/requirements.txt @@ -0,0 +1,3 @@ +requests==2.25.1 +toml==0.10.1 +UPnPy==1.1.8