diff --git a/panels/grapheditor.cpp b/panels/grapheditor.cpp index 7d13a905d..faaf91235 100644 --- a/panels/grapheditor.cpp +++ b/panels/grapheditor.cpp @@ -52,7 +52,7 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(nullptr) { right_tool_widget->setLayout(right_tool_layout); tools->addWidget(right_tool_widget); - keyframe_nav = new KeyframeNavigator(); + keyframe_nav = new KeyframeNavigator(0, false); keyframe_nav->enable_keyframes(true); keyframe_nav->enable_keyframe_toggle(false); left_tool_layout->addWidget(keyframe_nav); @@ -162,8 +162,8 @@ void GraphEditor::set_row(EffectRow *r) { slider_button->setCheckable(true); slider_button->setChecked(field->is_enabled()); slider_button->setIcon(QIcon(":/icons/record.png")); - slider_button->setProperty("field", i); - slider_button->setIconSize(slider_button->iconSize()*0.5); + 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))); slider_proxy_buttons.append(slider_button); value_layout->addWidget(slider_button); diff --git a/ui/graphview.cpp b/ui/graphview.cpp index 9fb8377f1..7b1783714 100644 --- a/ui/graphview.cpp +++ b/ui/graphview.cpp @@ -708,8 +708,6 @@ void GraphView::mouseReleaseEvent(QMouseEvent *) { } void GraphView::wheelEvent(QWheelEvent *event) { - dout << x_scroll << y_scroll; - bool redraw = false; bool shift = (event->modifiers() & Qt::ShiftModifier); // scroll instead of zoom diff --git a/ui/keyframenavigator.cpp b/ui/keyframenavigator.cpp index 228314d4c..baa87fc12 100644 --- a/ui/keyframenavigator.cpp +++ b/ui/keyframenavigator.cpp @@ -5,41 +5,44 @@ #include #include -KeyframeNavigator::KeyframeNavigator(QWidget *parent) : QWidget(parent) { +KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget(parent) { key_controls = new QHBoxLayout(); key_controls->setSpacing(0); key_controls->setMargin(0); - key_controls->addStretch(); + + if (addLeftPad) { + key_controls->addStretch(); + } setLayout(key_controls); left_key_nav = new QPushButton(); - left_key_nav->setIcon(QIcon(":/icons/tri-left.png")); - left_key_nav->setIconSize(left_key_nav->iconSize()*0.5); + left_key_nav->setIcon(QIcon(":/icons/tri-left.png")); + left_key_nav->setIconSize(left_key_nav->iconSize()*0.5); left_key_nav->setVisible(false); key_controls->addWidget(left_key_nav); connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(goto_previous_key())); connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); key_addremove = new QPushButton(); - key_addremove->setIcon(QIcon(":/icons/diamond.png")); - key_addremove->setIconSize(key_addremove->iconSize()*0.5); + key_addremove->setIcon(QIcon(":/icons/diamond.png")); + key_addremove->setIconSize(key_addremove->iconSize()*0.5); key_addremove->setVisible(false); key_controls->addWidget(key_addremove); connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(toggle_key())); connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); right_key_nav = new QPushButton(); - right_key_nav->setIcon(QIcon(":/icons/tri-right.png")); - right_key_nav->setIconSize(right_key_nav->iconSize()*0.5); + right_key_nav->setIcon(QIcon(":/icons/tri-right.png")); + right_key_nav->setIconSize(right_key_nav->iconSize()*0.5); right_key_nav->setVisible(false); key_controls->addWidget(right_key_nav); connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(goto_next_key())); connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked())); keyframe_enable = new QPushButton(QIcon(":/icons/clock.png"), ""); - keyframe_enable->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); - keyframe_enable->setIconSize(keyframe_enable->iconSize()*0.75); + keyframe_enable->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); + keyframe_enable->setIconSize(keyframe_enable->iconSize()*0.75); keyframe_enable->setCheckable(true); keyframe_enable->setToolTip(tr("Enable Keyframes")); connect(keyframe_enable, SIGNAL(clicked(bool)), this, SIGNAL(keyframe_enabled_changed(bool))); diff --git a/ui/keyframenavigator.h b/ui/keyframenavigator.h index d81f87f26..ec2b645b8 100644 --- a/ui/keyframenavigator.h +++ b/ui/keyframenavigator.h @@ -10,7 +10,7 @@ class KeyframeNavigator : public QWidget { Q_OBJECT public: - KeyframeNavigator(QWidget* parent = 0); + KeyframeNavigator(QWidget* parent = 0, bool addLeftPad = true); ~KeyframeNavigator(); void enable_keyframes(bool); void enable_keyframe_toggle(bool);