From 83b8bb153d013976f5d8dc8ca07a1797958748c8 Mon Sep 17 00:00:00 2001 From: tim Date: Sat, 11 Jan 2025 20:18:11 -0500 Subject: [PATCH] One function for model and cad custom icons Apply detect_icon_color_mode function to model and cad workspaces --- src/bonsai/bonsai/bim/module/cad/workspace.py | 18 ++---------------- .../bonsai/bim/module/model/workspace.py | 18 ++---------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/bonsai/bonsai/bim/module/cad/workspace.py b/src/bonsai/bonsai/bim/module/cad/workspace.py index 354ac9c7eb..a99de2287b 100644 --- a/src/bonsai/bonsai/bim/module/cad/workspace.py +++ b/src/bonsai/bonsai/bim/module/cad/workspace.py @@ -26,24 +26,10 @@ from bonsai.bim.module.model.data import AuthoringData, RailingData, RoofData from typing import Union -# TODO duplicate code in cad/workspace and model/workspace -def check_display_mode(): - global display_mode - try: - theme = bpy.context.preferences.themes["Default"] - text_color = theme.user_interface.wcol_menu_item.text - if sum(text_color) < 2.6: - display_mode = "lm" - else: - display_mode = "dm" - except: - display_mode = "dm" - - def load_custom_icons(): - global custom_icon_previews + global custom_icon_previews, display_mode if display_mode is None: - check_display_mode() + display_mode = tool.Blender.detect_icon_color_mode("ToolText") icons_dir = os.path.join(os.path.dirname(__file__), "..", "..", "data", "icons") custom_icon_previews = bpy.utils.previews.new() diff --git a/src/bonsai/bonsai/bim/module/model/workspace.py b/src/bonsai/bonsai/bim/module/model/workspace.py index 9989c5e267..9f75c2f2c9 100644 --- a/src/bonsai/bonsai/bim/module/model/workspace.py +++ b/src/bonsai/bonsai/bim/module/model/workspace.py @@ -32,24 +32,10 @@ from bonsai.bim.module.model.prop import get_ifc_class from typing import Optional, Union -# TODO duplicate code in cad/workspace and model/workspace -def check_display_mode(): - global display_mode - try: - theme = bpy.context.preferences.themes["Default"] - text_color = theme.user_interface.wcol_menu_item.text - if sum(text_color) < 2.6: - display_mode = "lm" - else: - display_mode = "dm" - except: - display_mode = "dm" - - def load_custom_icons(): - global custom_icon_previews + global custom_icon_previews, display_mode if display_mode is None: - check_display_mode() + display_mode = tool.Blender.detect_icon_color_mode("ToolText") icons_dir = os.path.join(os.path.dirname(__file__), "..", "..", "data", "icons") custom_icon_previews = bpy.utils.previews.new()