Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2024-10-01 03:15:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed colorpicker bug

Browse Source
This commit is contained in:
Mark Qvist 2023-10-22 16:02:39 +02:00
parent 336b527b0e
commit 666af3fffa
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbapp/kivymd/uix/pickers/colorpicker/colorpicker.py
View File

@ -644,12 +644,15 @@ class MDColorPicker(BaseDialog):
rgba = [0, 0, 0, 0] rgba = [0, 0, 0, 0]
if isinstance(selected_color, list): if isinstance(selected_color, list):
if selected_color[0] > 1: # if selected_color[0] > 1:
# rgba = [x / 255.0 for x in selected_color] + [
# self._opacity_value_selected_color
# ]
# else:
# rgba = selected_color
rgba = [x / 255.0 for x in selected_color] + [ rgba = [x / 255.0 for x in selected_color] + [
self._opacity_value_selected_color self._opacity_value_selected_color
] ]
else:
rgba = selected_color
elif isinstance(selected_color, str): elif isinstance(selected_color, str):
rgba = get_color_from_hex(selected_color)[:-1] + [ rgba = get_color_from_hex(selected_color)[:-1] + [
self._opacity_value_selected_color self._opacity_value_selected_color

8
sbapp/main.py
View File

@ -3004,12 +3004,12 @@ class SidebandApp(MDApp):
color_picker.open() color_picker.open()
color_picker.bind(on_release=self.telemetry_fg_select) color_picker.bind(on_release=self.telemetry_fg_select)
def job(sender=None): def job(sender=None):
color_picker._rgb = self.sideband.config["telemetry_fg"][:-1] color_picker._rgb = self.sideband.config["telemetry_fg"][0:3]
color_picker.ids.view_headline.on_tab_press() color_picker.ids.view_headline.on_tab_press()
Clock.schedule_once(job, 0) Clock.schedule_once(job, 0)
def telemetry_fg_select(self, instance_color_picker: MDColorPicker, type_color: str, selected_color: Union[list, str]): def telemetry_fg_select(self, instance_color_picker: MDColorPicker, type_color: str, selected_color: Union[list, str]):
color = selected_color[:-1] + [1] s = selected_color; color = [s[0], s[1], s[2], 1]
self.telemetry_screen.ids.telemetry_icon_preview.icon_color = color self.telemetry_screen.ids.telemetry_icon_preview.icon_color = color
self.sideband.config["telemetry_fg"] = color self.sideband.config["telemetry_fg"] = color
self.sideband.save_configuration() self.sideband.save_configuration()
@ -3025,12 +3025,12 @@ class SidebandApp(MDApp):
color_picker.open() color_picker.open()
color_picker.bind(on_release=self.telemetry_bg_select) color_picker.bind(on_release=self.telemetry_bg_select)
def job(sender=None): def job(sender=None):
color_picker._rgb = self.sideband.config["telemetry_bg"][:-1] color_picker._rgb = self.sideband.config["telemetry_bg"][0:3]
color_picker.ids.view_headline.on_tab_press() color_picker.ids.view_headline.on_tab_press()
Clock.schedule_once(job, 0) Clock.schedule_once(job, 0)
def telemetry_bg_select(self, instance_color_picker: MDColorPicker, type_color: str, selected_color: Union[list, str]): def telemetry_bg_select(self, instance_color_picker: MDColorPicker, type_color: str, selected_color: Union[list, str]):
color = selected_color[:-1] + [1] s = selected_color; color = [s[0], s[1], s[2], 1]
self.telemetry_screen.ids.telemetry_icon_preview.md_bg_color = color self.telemetry_screen.ids.telemetry_icon_preview.md_bg_color = color
self.sideband.config["telemetry_bg"] = color self.sideband.config["telemetry_bg"] = color
self.sideband.save_configuration() self.sideband.save_configuration()