diff --git a/src/Engine/Operator/OperatorTable.cpp b/src/Engine/Operator/OperatorTable.cpp index 0f0df41..906c5c5 100644 --- a/src/Engine/Operator/OperatorTable.cpp +++ b/src/Engine/Operator/OperatorTable.cpp @@ -21,4 +21,10 @@ enzo::nt::opConstructor enzo::op::OperatorTable::getOpConstructor(std::string na return nullptr; } +std::vector enzo::op::OperatorTable::getData() +{ + return opInfoStore_; +} + + std::vector enzo::op::OperatorTable::opInfoStore_; diff --git a/src/Engine/Operator/OperatorTable.h b/src/Engine/Operator/OperatorTable.h index 2fd4670..a385db0 100644 --- a/src/Engine/Operator/OperatorTable.h +++ b/src/Engine/Operator/OperatorTable.h @@ -19,6 +19,7 @@ class BOOST_SYMBOL_EXPORT OperatorTable public: static void addOperator(const char* internalName, const char* displayName, nt::opConstructor ctorFunc); static nt::opConstructor getOpConstructor(std::string name); + static std::vector getData(); private: static std::vector opInfoStore_; }; diff --git a/src/Gui/Network/Network.cpp b/src/Gui/Network/Network.cpp index ee27604..33adcc7 100644 --- a/src/Gui/Network/Network.cpp +++ b/src/Gui/Network/Network.cpp @@ -410,3 +410,4 @@ void Network::mouseReleaseEvent(QMouseEvent *event) } } } + diff --git a/src/Gui/Network/Network.h b/src/Gui/Network/Network.h index d05d520..0b4a71f 100644 --- a/src/Gui/Network/Network.h +++ b/src/Gui/Network/Network.h @@ -151,6 +151,7 @@ private: return closestItem; } + protected: void resizeEvent(QResizeEvent *event) override; void mouseReleaseEvent(QMouseEvent *event) override; diff --git a/src/Gui/Network/TabMenu.cpp b/src/Gui/Network/TabMenu.cpp index 072060a..d537263 100644 --- a/src/Gui/Network/TabMenu.cpp +++ b/src/Gui/Network/TabMenu.cpp @@ -1,4 +1,5 @@ #include "Gui/Network/TabMenu.h" +#include "Engine/Operator/OperatorTable.h" #include #include #include @@ -24,6 +25,7 @@ enzo::ui::TabMenu::TabMenu(QWidget *parent, Qt::WindowFlags f) setLayout(mainLayout_); searchBar_ = new QLineEdit(); + searchBar_->setFocusPolicy(Qt::NoFocus); nodeHolder_ = new QWidget(); nodeScrollArea_ = new QScrollArea(); @@ -35,9 +37,12 @@ enzo::ui::TabMenu::TabMenu(QWidget *parent, Qt::WindowFlags f) nodeHolderLayout_ = new QVBoxLayout(); nodeHolder_->setLayout(nodeHolderLayout_); - for(int i=0; i<10; ++i) + auto tableItems = enzo::op::OperatorTable::getData(); + nodeScrollArea_->setFocusPolicy(Qt::NoFocus); + for(auto tableItem : tableItems) { - auto button = new QPushButton(std::string("Node " + std::to_string(i)).c_str()); + auto button = new QPushButton(tableItem.displayName.c_str()); + button->setFocusPolicy(Qt::NoFocus); button->setStyleSheet(R"( QPushButton { background-color: #181c1d; @@ -85,7 +90,6 @@ void enzo::ui::TabMenu::focusOutEvent(QFocusEvent *event) bool enzo::ui::TabMenu::event(QEvent *event) { - std::cout << "event\n"; if( (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) && event->spontaneous()