From 97fc0d2716eaba57f4d69e73fd5c4eff945dbba7 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 1 Aug 2024 22:42:25 +0200 Subject: [PATCH] Refactor: Change Name of ed_workspace_status_mouse_item Rename ed_workspace_status_mouse_item to ed_workspace_status_icon_item as this is not specific to mouse icons. Just a brain-fart because this function has specific handling of mouse icons because of spacing issues. Pull Request: https://projects.blender.org/blender/blender/pulls/125790 --- source/blender/editors/screen/area.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index f8ed80c06f7..ca42e858363 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -887,9 +887,9 @@ static void ed_workspace_status_text_item(WorkSpace *workspace, std::string text } } -static void ed_workspace_status_mouse_item(WorkSpace *workspace, - const int icon, - const bool inverted = false) +static void ed_workspace_status_icon_item(WorkSpace *workspace, + const int icon, + const bool inverted = false) { if (icon) { ed_workspace_status_item(workspace, {}, icon, 0.0f, inverted); @@ -908,8 +908,8 @@ static void ed_workspace_status_mouse_item(WorkSpace *workspace, void WorkspaceStatus::item(std::string text, const int icon1, const int icon2) { - ed_workspace_status_mouse_item(workspace_, icon1); - ed_workspace_status_mouse_item(workspace_, icon2); + ed_workspace_status_icon_item(workspace_, icon1); + ed_workspace_status_icon_item(workspace_, icon2); ed_workspace_status_text_item(workspace_, std::move(text)); } @@ -927,8 +927,8 @@ void WorkspaceStatus::item_bool(std::string text, const int icon1, const int icon2) { - ed_workspace_status_mouse_item(workspace_, icon1, inverted); - ed_workspace_status_mouse_item(workspace_, icon2, inverted); + ed_workspace_status_icon_item(workspace_, icon1, inverted); + ed_workspace_status_icon_item(workspace_, icon2, inverted); ed_workspace_status_text_item(workspace_, std::move(text)); } @@ -958,7 +958,7 @@ void WorkspaceStatus::opmodal(std::string text, if (!ELEM(kmi->oskey, KM_NOTHING, KM_ANY)) { ed_workspace_status_item(workspace_, {}, ICON_EVENT_OS, 0.0f, inverted); } - ed_workspace_status_mouse_item(workspace_, icon, inverted); + ed_workspace_status_icon_item(workspace_, icon, inverted); ed_workspace_status_text_item(workspace_, std::move(text)); } }