Merge branch 'master' of https://github.com/olive-editor/olive

ui/mainwindow.cpp

@@ -279,6 +279,9 @@ MainWindow::MainWindow(QWidget *parent) :
 
   olive::Global->check_for_autorecovery_file();
 
+  // lock panels if the config says so
+  set_panels_locked(olive::CurrentConfig.locked_panels);
+
   // set up output audio device
   init_audio();
 
@@ -1188,6 +1191,8 @@ void MainWindow::set_panels_locked(bool locked)
       panel->setTitleBarWidget(nullptr);
     }
   }
+
+  olive::CurrentConfig.locked_panels = locked;
 }
 
 void MainWindow::fileMenu_About_To_Be_Shown() {

ui/texteditex.cpp

@@ -32,8 +32,11 @@ TextEditEx::TextEditEx(QWidget *parent, bool enable_rich_text) :
   enable_rich_text_(enable_rich_text)
 {
   QVBoxLayout* layout = new QVBoxLayout(this);
+  layout->setMargin(0);
+  layout->setSpacing(0);
 
   text_editor_ = new QTextEdit();
+  text_editor_->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Expanding);
   connect(text_editor_, SIGNAL(textChanged()), this, SLOT(queue_text_modified()));
   layout->addWidget(text_editor_);