From 26c7133cc7c898c3b84c6e9a43fb056604615c23 Mon Sep 17 00:00:00 2001
From: itsmattkc <olivevideoeditor@gmail.com>
Date: Wed, 26 Dec 2018 18:27:12 +1100
Subject: [PATCH] added it to effect controls

---
 panels/effectcontrols.cpp |  1 +
 panels/effectcontrols.ui  | 11 ++++++++---
 ui/keyframeview.cpp       |  4 ++++
 ui/keyframeview.h         |  3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

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 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>225</width>
-          <height>477</height>
+          <width>189</width>
+          <height>483</height>
          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -502,7 +502,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QScrollBar" name="horizontalScrollBar">
+         <widget class="ResizableScrollBar" name="horizontalScrollBar">
           <property name="maximum">
            <number>0</number>
           </property>
@@ -543,6 +543,11 @@
    <header>panels/effectcontrols.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ResizableScrollBar</class>
+   <extends>QScrollBar</extends>
+   <header>ui/resizablescrollbar.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
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<EffectRow*> 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);