Merge branch 'master' into cache-update

app/widget/colorwheel/colorvalueswidget.cpp

@@ -26,6 +26,7 @@
 
 #include "config/config.h"
 #include "core.h"
+#include "ui/icons/icons.h"
 
 namespace olive {
 
@@ -51,7 +52,9 @@ ColorValuesWidget::ColorValuesWidget(ColorManager *manager, QWidget *parent) :
     preview_->setFixedHeight(fontMetrics().height() * 3 / 2);
     preview_layout->addWidget(preview_);
 
-    color_picker_btn_ = new QPushButton(tr("Pick"));
+    color_picker_btn_ = new QPushButton();
+    color_picker_btn_->setIcon(icon::ColorPicker);
+    color_picker_btn_->setFixedWidth(color_picker_btn_->sizeHint().height());
     color_picker_btn_->setCheckable(true);
     connect(color_picker_btn_, &QPushButton::toggled, this, &ColorValuesWidget::ColorPickedBtnToggled);
     connect(Core::instance(), &Core::ColorPickerColorEmitted, this, &ColorValuesWidget::SetReferenceColor);

app/widget/timelinewidget/timelinewidget.cpp

@@ -1886,6 +1886,10 @@ void TimelineWidget::SetSelections(const TimelineWidgetSelections &s, bool proce
     return;
   }
 
+  if (!GetConnectedNode()) {
+    return;
+  }
+
   if (process_block_changes) {
     QVector<Block*> deselected;
     QVector<Block*> selected;

app/widget/viewer/viewerdisplay.cpp

@@ -738,7 +738,7 @@ void ViewerDisplayWidget::OpenTextGizmo(TextGizmo *text, QMouseEvent *event)
 
   // Create toolbar
   text_toolbar_ = new ViewerTextEditorToolBar(text_edit_);
-  text_toolbar_->setWindowFlags(Qt::Window | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
+  text_toolbar_->setWindowFlags(Qt::Dialog| Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint);
   connect(text_toolbar_, &ViewerTextEditorToolBar::VerticalAlignmentChanged, text, &TextGizmo::SetVerticalAlignment);
   connect(text, &TextGizmo::VerticalAlignmentChanged, text_toolbar_, &ViewerTextEditorToolBar::SetVerticalAlignment);
   text_toolbar_->SetVerticalAlignment(text->GetVerticalAlignment());