comparison view/View.cpp @ 1402:b0eeec95ab5b

Handle integer pixel scaling as well

         if ((*i)->needsTextLabelHeight()) {
             sortedLayers[getObjectExportId(*i)] = *i;
         }
     }
 
-    int y = scaleSize(15) + paint.fontMetrics().ascent();
+    int y = scalePixelSize(15) + paint.fontMetrics().ascent();
 
     for (std::map<int, Layer *>::const_iterator i = sortedLayers.begin();
          i != sortedLayers.end(); ++i) {
         if (i->second == layer) break;
         y += paint.fontMetrics().height();

     pb->setTextVisible(false);
 
     QPushButton *cancel = new QPushButton(this);
     cancel->setIcon(IconLoader().load("cancel"));
     cancel->setFlat(true);
-    int scaled20 = scaleSize(20);
+    int scaled20 = scalePixelSize(20);
     cancel->setFixedSize(QSize(scaled20, scaled20));
     connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked()));
     
     ProgressBarRec pbr;
     pbr.cancel = cancel;

     }
 
     return size * ratio;
 }
 
+int
+View::scalePixelSize(int size) const
+{
+    double d = scaleSize(size);
+    int i = int(d + 0.5);
+    if (size != 0 && i == 0) i = 1;
+    return i;
+}
+
 double
 View::scalePenWidth(double width) const 
 {
     if (width <= 0) { // zero-width pen, produce a scaled one-pixel pen
         width = 1;

                     i->second.lastCheck = 0;
                     timer->setInterval(2000);
                     timer->start();
                 }
 
-                int scaled20 = scaleSize(20);
+                int scaled20 = scalePixelSize(20);
 
                 cancel->move(0, ph - pb->height()/2 - scaled20/2);
                 cancel->show();
 
                 pb->setValue(completion);