Compare commits
1 Commits
50bd5619c5
...
96a004e029
Author | SHA1 | Date | |
---|---|---|---|
96a004e029 |
@ -123,8 +123,8 @@ void ToolBox::refreshProperties(const Object * object)
|
||||
|
||||
void ToolBox::refreshShaders(const Object * object)
|
||||
{
|
||||
vertex_.path.setItem(object->getVertexShader().c_str());
|
||||
vertex_.path.setValue(object->getVertexShader().c_str());
|
||||
vertex_.editor->setText(object->getVertexShaderSourceCode().c_str());
|
||||
fragment_.path.setItem(object->getFragmentShader().c_str());
|
||||
fragment_.path.setValue(object->getFragmentShader().c_str());
|
||||
fragment_.editor->setText(object->getFragmentShaderSourceCode().c_str());
|
||||
}
|
||||
|
@ -63,10 +63,9 @@ namespace Qtk
|
||||
label(new QLabel(tr(l), parent)),
|
||||
value(new QLabel(tr(v), parent))
|
||||
{
|
||||
value->setText(v);
|
||||
}
|
||||
|
||||
void setItem(const QString & v) { setItem(label->text(), v); }
|
||||
void setValue(const QString & v) { value->setText(v); }
|
||||
|
||||
void setItem(const QString & l, const QString & v)
|
||||
{
|
||||
@ -161,7 +160,7 @@ namespace Qtk
|
||||
class ShaderView final : QWidget
|
||||
{
|
||||
public:
|
||||
explicit ShaderView(QWidget * parent = nullptr,
|
||||
explicit ShaderView(QWidget * parent,
|
||||
const char * l = "ShaderView:") :
|
||||
layout(new QVBoxLayout(this)), path(parent, l),
|
||||
editor(new QTextEdit(parent))
|
||||
|
@ -251,6 +251,8 @@ namespace Qtk
|
||||
/**
|
||||
* Helper to disconnect a QObject connection, only if it's valid.
|
||||
* If the connection is valid and we fail to disconnect log a message.
|
||||
*
|
||||
* @param con QObject connection handle to disconnect.
|
||||
*/
|
||||
static void disconnect(const QMetaObject::Connection & con)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user