griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Change Name of ed_workspace_status_mouse_item

Browse Source 
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
This commit is contained in:
Harley Acheson
2024-08-01 22:42:25 +02:00
committed by Harley Acheson
parent 48d55fb420
commit 97fc0d2716
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/screen/area.cc
View File

@@ -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));
}
}