From 5fdf1e87fe50a295c0dc978ad80006c6ed139338 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 9 Feb 2023 19:35:52 +0000 Subject: [PATCH] Bug fixes * Fixed traceback crash (doh!) caused by uncaught ast eval exception * Fixed dev colour code info screen --- game/scripts/utility/common_functions.rpy | 6 +++++- game/scripts/wardrobe/color_picker.rpy | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/game/scripts/utility/common_functions.rpy b/game/scripts/utility/common_functions.rpy index fb342dbe..3ba699ed 100644 --- a/game/scripts/utility/common_functions.rpy +++ b/game/scripts/utility/common_functions.rpy @@ -94,7 +94,11 @@ init -1 python: return None def evaluate(txt): - return __import__('ast').literal_eval(txt) + try: + return __import__('ast').literal_eval(txt) + except Exception as e: + print("Error evaluating clipboard data:") + print(e) def reset_variables(*args): """Resets the given variables to their default values.""" diff --git a/game/scripts/wardrobe/color_picker.rpy b/game/scripts/wardrobe/color_picker.rpy index 41b3f2db..5063d038 100644 --- a/game/scripts/wardrobe/color_picker.rpy +++ b/game/scripts/wardrobe/color_picker.rpy @@ -520,9 +520,10 @@ screen colorpickerscreen(item=None): text "Alpha:[cp.alpha]" if item: - textbutton "Colour code: [item.color]": - action Function(set_clipboard, str(item.color)) - #alternate [Function(item.set_color, evaluate(get_clipboard()))] + $ colorcode = [i.hexcode for i in item.color] + textbutton "Colour code: [colorcode]": + action [Function(set_clipboard, json.dumps(colorcode)), Notify("Colorcode copied to clipboard.")] + #alternate [Function(item.set_color, evaluate(str(get_clipboard())))] keysym ["ctrl_K_c"] #alternate_keysym ["ctrl_K_v"]