# HG changeset patch
# User Chris Cannam
# Date 1538731552 -3600
# Node ID e848ea0850fe4c39d2fd82676706558377e12090
# Parent  4949061fcb8cfc937791f88d743c2a51c65061cd# Parent  9fb7133dd818aadb973f103dd515b6fc60751879
Merge from default branch

diff -r 4949061fcb8c -r e848ea0850fe view/View.cpp
--- a/view/View.cpp	Fri Oct 05 09:59:41 2018 +0100
+++ b/view/View.cpp	Fri Oct 05 10:25:52 2018 +0100
@@ -633,9 +633,10 @@
     pb->setTextVisible(false);
 
     QPushButton *cancel = new QPushButton(this);
-    cancel->setIcon(IconLoader().load("fileclose"));
+    cancel->setIcon(IconLoader().load("cancel"));
     cancel->setFlat(true);
-    cancel->setFixedSize(QSize(20, 20));
+    int scaled20 = ViewManager::scalePixelSize(20);
+    cancel->setFixedSize(QSize(scaled20, scaled20));
     connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked()));
     
     ProgressBarRec pbr;
@@ -1644,11 +1645,13 @@
                     timer->start();
                 }
 
-                cancel->move(0, ph - pb->height()/2 - 10);
+                int scaled20 = ViewManager::scalePixelSize(20);
+
+                cancel->move(0, ph - pb->height()/2 - scaled20/2);
                 cancel->show();
 
                 pb->setValue(completion);
-                pb->move(20, ph - pb->height());
+                pb->move(scaled20, ph - pb->height());
 
                 pb->show();
                 pb->update();