Small tweaks to the layout code. Still not perfect aspect.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5535c151bfcf2594390d5bdb141785acfa4c77de..5cd698e39cc65346ea06321da3ebe1cdfb56d827 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -280,8 +280,9 @@ void MainWindow::relayout()
        remaining_height -= audiostrip_height + ui->vertical_layout->spacing();
 
        // The previews will be constrained by the remaining height, and the width.
-       double preview_label_height = previews[0]->title_bar->geometry().height() + ui->preview_displays->spacing();  // Wrong spacing?
-       int preview_total_width = ui->preview_displays->geometry().width();
+       double preview_label_height = previews[0]->title_bar->geometry().height() +
+               previews[0]->main_vertical_layout->spacing();
+       int preview_total_width = ui->preview_displays->geometry().width() - (previews.size() - 1) * ui->preview_displays->spacing();
        double preview_height = min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
        remaining_height -= preview_height + preview_label_height + ui->vertical_layout->spacing();
 
@@ -292,14 +293,12 @@ void MainWindow::relayout()
 
        // Set the widths for the previews.
        double preview_width = preview_height * 16.0 / 9.0;
-       double remaining_preview_width = preview_total_width;
-
        for (unsigned i = 0; i < previews.size(); ++i) {
                ui->preview_displays->setStretch(i, lrintf(preview_width));
-               remaining_preview_width -= preview_width + ui->preview_displays->spacing();
        }
 
        // The preview horizontal spacer.
+       double remaining_preview_width = preview_total_width - previews.size() * preview_width;
        ui->preview_displays->setStretch(previews.size(), lrintf(remaining_preview_width));
 }
 

diff --git a/ui_display.ui b/ui_display.ui
index 40c6e437aa20dcbf633f8a57d217036b64c3a10f..79be4c241f808b05d46864c8a1d0c2f671c9fcf4 100644 (file)
--- a/ui_display.ui
+++ b/ui_display.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="main_vertical_layout">
    <property name="leftMargin">
     <number>0</number>
    </property>