Mercurial > hg > svgui

changeset 1353:86429ff00f05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch zoom
author Chris Cannam
date Wed, 10 Oct 2018 08:44:27 +0100
parents 9fb7133dd818 (diff) 4949061fcb8c (current diff)
children 40b9a495a0e0
files view/View.cpp
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/view/View.cpp	Fri Oct 05 09:59:41 2018 +0100
+++ b/view/View.cpp	Wed Oct 10 08:44:27 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();