Skip to content

Updating usability for Graph Editor Add Node #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 1 commit into from
Jun 22, 2023
Merged

Updating usability for Graph Editor Add Node #1387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion source/MaterialXGraphEditor/Graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2487,6 +2487,10 @@ void Graph::AddLink(ed::PinId inputPinId, ed::PinId outputPinId)
{
pin->_input->setConnectedOutput(_graphNodes[upNode]->getOutput());
}
else if (_graphNodes[upNode]->getInput() != nullptr)
{
pin->_input->setInterfaceName(_graphNodes[upNode]->getName());
}
else
{
// node graph
Expand Down Expand Up @@ -3405,6 +3409,7 @@ void Graph::showHelp() const
void Graph::addNodePopup(bool cursor)
{
bool open_AddPopup = ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) && ImGui::IsKeyReleased(ImGuiKey_Tab);
static char input[32]{ "" };
if (open_AddPopup)
{
cursor = true;
Expand All @@ -3414,7 +3419,6 @@ void Graph::addNodePopup(bool cursor)
{
ImGui::Text("Add Node");
ImGui::Separator();
static char input[32]{ "" };
if (cursor)
{
ImGui::SetKeyboardFocusHere();
Expand All @@ -3433,6 +3437,9 @@ void Graph::addNodePopup(bool cursor)
{
std::string str(it->second[i][0]);
std::string nodeName = it->second[i][0];
//allow spaces to be used to search for node names
std::replace(subs.begin(), subs.end(), ' ', '_');

if (str.find(subs) != std::string::npos)
{
if (ImGui::MenuItem(getNodeDefId(nodeName).c_str()) || (ImGui::IsItemFocused() && ImGui::IsKeyPressedMap(ImGuiKey_Enter)))
Expand Down
⚡