merged with master

ui/effectui.cpp

@@ -86,6 +86,7 @@ EffectUI::EffectUI(Effect* e) :
   SetTitle(effect_name);
 
   QWidget* ui = new QWidget(this);
+  ui->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
   SetContents(ui);
 
   SetExpanded(e->IsExpanded());

ui/keyframenavigator.cpp

@@ -39,7 +39,11 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
     key_controls->addStretch();
   }
 
+  QSizePolicy button_size_policy;
+  button_size_policy.setRetainSizeWhenHidden(true);
+
   left_key_nav = new QPushButton(this);
+  left_key_nav->setSizePolicy(button_size_policy);
   left_key_nav->setIcon(olive::icon::LeftArrow);
   left_key_nav->setIconSize(left_key_nav->iconSize()*0.5);
   left_key_nav->setVisible(false);
@@ -48,6 +52,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
   connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked()));
 
   key_addremove = new QPushButton(this);
+  key_addremove->setSizePolicy(button_size_policy);
   key_addremove->setIcon(olive::icon::Diamond);
   key_addremove->setIconSize(key_addremove->iconSize()*0.5);
   key_addremove->setVisible(false);
@@ -56,6 +61,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
   connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(clicked()));
 
   right_key_nav = new QPushButton(this);
+  right_key_nav->setSizePolicy(button_size_policy);
   right_key_nav->setIcon(olive::icon::RightArrow);
   right_key_nav->setIconSize(right_key_nav->iconSize()*0.5);
   right_key_nav->setVisible(false);

ui/sourceiconview.cpp

@@ -98,7 +98,7 @@ SourceIconDelegate::SourceIconDelegate(QObject *parent) :
 {
 }
 
-QSize SourceIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize SourceIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &) const
 {
   if (option.decorationPosition == QStyleOptionViewItem::Top) { // Icon Mode
 

ui/timelineheader.cpp

@@ -66,9 +66,9 @@ TimelineHeader::TimelineHeader(QWidget *parent) :
   in_visible(0),
   fm(font()),
   dragging_markers(false),
-  scroll(0)
+  scroll(0),
+  height_actual(fm.height())
 {
-  height_actual = fm.height();
   setCursor(Qt::ArrowCursor);
   setMouseTracking(true);
   setFocusPolicy(Qt::ClickFocus);
@@ -467,6 +467,10 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
     path.lineTo(in_x+PLAYHEAD_SIZE+1, yoff);
     path.lineTo(start);
     p.fillPath(path, Qt::red);
+
+    // Draw white line at the top for clarity
+    p.setPen(Qt::gray);
+    p.drawLine(0, 0, width(), 0);
   }
 }
 

ui/viewerwidget.cpp

@@ -242,7 +242,7 @@ void ViewerWidget::frame_update() {
     }
 
     // render the audio
-    olive::rendering::compose_audio(viewer, viewer->seq.get(), viewer->get_playback_speed(), viewer->WaitingForPlayWake());
+    olive::rendering::compose_audio(viewer, viewer->seq.get(), viewer->get_playback_speed(), false);
   }
 }