Mercurial > hg > svgui

changeset 1360:e848ea0850fe zoom

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Fri, 05 Oct 2018 10:25:52 +0100
parents 4949061fcb8c (current diff) 9fb7133dd818 (diff)
children 2e3b3fadba27 631897ba9fca
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	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();