oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/1717

Browse Source
This commit is contained in:
itsmattkc
2022-05-01 10:58:44 -07:00
parent fdcee7cd07 004c66a073
commit e8dde836e3
1583 changed files with 89018 additions and 321451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/node/node.cpp
+2 -1
View File
@@ -31,7 +31,8 @@ NodePanel::NodePanel(QWidget *parent) :
// Connect node view signals to this panel - MAY REMOVE
connect(node_widget_->view(), &NodeView::NodesSelected, this, &NodePanel::NodesSelected);
connect(node_widget_->view(), &NodeView::NodesDeselected, this, &NodePanel::NodesDeselected);
connect(node_widget_->view(), &NodeView::NodeGroupOpenRequested, this, &NodePanel::NodeGroupOpenRequested);
connect(node_widget_->view(), &NodeView::NodeGroupOpened, this, &NodePanel::NodeGroupOpened);
connect(node_widget_->view(), &NodeView::NodeGroupClosed, this, &NodePanel::NodeGroupClosed);
// Set it as the main widget of this panel
SetWidgetWithPadding(node_widget_);
app/panel/node/node.h
+6 -10
View File
@@ -40,10 +40,9 @@ public:
return node_widget_;
}
const QVector<Node*> &GetContexts() const
{
return node_widget_->view()->GetContexts();
}
const QVector<Node*> &GetContexts() const { return node_widget_->view()->GetContexts(); }
bool IsGroupOverlay() const { return node_widget_->view()->IsGroupOverlay(); }
void SetContexts(const QVector<Node*> &nodes)
{
@@ -55,11 +54,6 @@ public:
node_widget_->view()->CloseContextsBelongingToProject(project);
}
const QVector<Node*> &GetCurrentContexts() const
{
return node_widget_->view()->GetCurrentContexts();
}
virtual void SelectAll() override
{
node_widget_->view()->SelectAll();
@@ -122,7 +116,9 @@ signals:
void NodesDeselected(const QVector<Node*>& nodes);
void NodeGroupOpenRequested(NodeGroup *group);
void NodeGroupOpened(NodeGroup *group);
void NodeGroupClosed();
private:
virtual void Retranslate() override
app/panel/param/param.h
-10
View File
@@ -43,16 +43,6 @@ public:
return GetParamView()->GetContexts();
}
void SetCreateCheckBoxes(NodeParamViewCheckBoxBehavior e)
{
GetParamView()->SetCreateCheckBoxes(e);
}
void SetIgnoreNodeFlags(bool e)
{
GetParamView()->SetIgnoreNodeFlags(e);
}
void CloseContextsBelongingToProject(Project *p)
{
GetParamView()->CloseContextsBelongingToProject(p);