diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp
index 3fa48359c..4809aa482 100644
--- a/panels/effectcontrols.cpp
+++ b/panels/effectcontrols.cpp
@@ -43,6 +43,7 @@ EffectControls::EffectControls(QWidget *parent) :
ui->label_2->setVisible(false);
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), ui->headers, SLOT(set_scroll(int)));
+ connect(ui->horizontalScrollBar, SIGNAL(resize_move(double)), ui->keyframeView, SLOT(resize_move(double)));
connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), ui->keyframeView, SLOT(set_x_scroll(int)));
connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), ui->keyframeView, SLOT(set_y_scroll(int)));
connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), ui->scrollArea->verticalScrollBar(), SLOT(setValue(int)));
diff --git a/panels/effectcontrols.ui b/panels/effectcontrols.ui
index 8c450c815..587946d5a 100644
--- a/panels/effectcontrols.ui
+++ b/panels/effectcontrols.ui
@@ -71,8 +71,8 @@
0
0
- 225
- 477
+ 189
+ 483
@@ -502,7 +502,7 @@
-
-
+
0
@@ -543,6 +543,11 @@
1
+
+ ResizableScrollBar
+ QScrollBar
+
+
diff --git a/ui/keyframeview.cpp b/ui/keyframeview.cpp
index de5ff7cb3..8fd23f63c 100644
--- a/ui/keyframeview.cpp
+++ b/ui/keyframeview.cpp
@@ -189,6 +189,10 @@ void KeyframeView::draw_keyframe(QPainter &p, int type, int x, int y, bool darke
}
}
+void KeyframeView::resize_move(double d) {
+ header->update_zoom(header->get_zoom()*d);
+}
+
void KeyframeView::mousePressEvent(QMouseEvent *event) {
if (event->button() == Qt::LeftButton) {
int row_index = -1;
diff --git a/ui/keyframeview.h b/ui/keyframeview.h
index cfaebc419..e565d6e61 100644
--- a/ui/keyframeview.h
+++ b/ui/keyframeview.h
@@ -23,6 +23,7 @@ public:
public slots:
void set_x_scroll(int);
void set_y_scroll(int);
+ void resize_move(double d);
private:
long adjust_row_keyframe(EffectRow* row, long time);
QVector selected_rows;
@@ -38,7 +39,7 @@ private:
bool mousedown;
bool dragging;
bool keys_selected;
- bool select_rect;
+ bool select_rect;
bool keyframeIsSelected(EffectRow* row, int keyframe);