Merge branch 'master' of https://github.com/olive-editor/olive into furtherocio

This commit is contained in:
itsmattkc
2019-03-18 16:03:33 +11:00
4 changed files with 43 additions and 34 deletions
+2 -1
View File
@@ -36,6 +36,7 @@
#include "timeline/clip.h"
#include "rendering/renderfunctions.h"
#include "panels.h"
#include "ui/icons.h"
#include "global/debug.h"
GraphEditor::GraphEditor(QWidget* parent) : Panel(parent), row(nullptr) {
@@ -184,7 +185,7 @@ void GraphEditor::set_row(EffectRow *r) {
QPushButton* slider_button = new QPushButton();
slider_button->setCheckable(true);
slider_button->setChecked(field->IsEnabled());
slider_button->setIcon(QIcon(":/icons/record.svg"));
slider_button->setIcon(olive::icon::CreateIconFromSVG(":/icons/record.svg", false));
slider_button->setProperty("field", i);
slider_button->setIconSize(slider_button->iconSize()*0.5);
connect(slider_button, SIGNAL(toggled(bool)), this, SLOT(set_field_visibility(bool)));