Merge branch 'issue_70' of https://github.com/ThomasWilshaw/olive into ThomasWilshaw-issue_70

# Conflicts: # app/widget/viewer/viewerwindow.cpp
2020-09-06 17:40:14 +10:00
parent 43d0129004 8682b1e678
commit ba64313dd7
6 changed files with 228 additions and 16 deletions
@@ -137,7 +137,7 @@ void ViewerWindow::UpdateMatrix()
    mat.scale(1.0f, window_ar / image_ar, 1.0f);
  }

-  display_widget_->SetMatrix(mat);
+  display_widget_->SetMatrixZoom(mat);
 }

 OLIVE_NAMESPACE_EXIT