Merge branch 'furtherocio' into nodes

2019-04-21 23:03:48 +10:00
parent 1c6d7d0c6f 43284ced8b
commit 616e2b4740
9 changed files with 62 additions and 36 deletions
@@ -619,7 +619,7 @@ void Viewer::setup_ui() {
  lower_control_layout->setMargin(0);

  QSizePolicy timecode_container_policy(QSizePolicy::Minimum, QSizePolicy::Maximum);
-  QSizePolicy lower_control_policy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+  QSizePolicy lower_control_policy(QSizePolicy::Maximum, QSizePolicy::Maximum);

  // Current time code container
  QWidget* current_timecode_container = new QWidget();