comparison view/View.cpp @ 339:ac954fc0ec6f

* Fix #1844539 confusing waveform navigator with secondary files

 
     m_progressBars[layer] = new LayerProgressBar(this);
     m_progressBars[layer]->setMinimum(0);
     m_progressBars[layer]->setMaximum(100);
     m_progressBars[layer]->setMinimumWidth(80);
+
     QFont f(m_progressBars[layer]->font());
-    f.setPointSize(Preferences::getInstance()->getViewFontSize());
+    int fs = Preferences::getInstance()->getViewFontSize();
+    f.setPointSize(std::min(fs, int(ceil(fs * 0.85))));
+
     m_progressBars[layer]->setFont(f);
     m_progressBars[layer]->hide();
     
     connect(layer, SIGNAL(layerParametersChanged()),
 	    this,    SLOT(layerParametersChanged()));

 	    if (i->second->isVisible()) {
 		ph -= i->second->height();
 	    }
 	}
     }
+}
+
+void
+View::setPaintFont(QPainter &paint)
+{
+    QFont font(paint.font());
+    font.setPointSize(Preferences::getInstance()->getViewFontSize());
+    paint.setFont(font);
 }
 
 void
 View::paintEvent(QPaintEvent *e)
 {

 
     if (!paintedCacheRect) {
 
 	if (repaintCache) paint.begin(m_cache);
 	else paint.begin(this);
-
-        QFont font(paint.font());
-        font.setPointSize(Preferences::getInstance()->getViewFontSize());
-        paint.setFont(font);
-
+        setPaintFont(paint);
 	paint.setClipRect(cacheRect);
 
         paint.setPen(getBackground());
         paint.setBrush(getBackground());
 	paint.drawRect(cacheRect);

 
     nonCacheRect |= cacheRect;
 
     paint.begin(this);
     paint.setClipRect(nonCacheRect);
-
-    QFont font(paint.font());
-    font.setPointSize(Preferences::getInstance()->getViewFontSize());
-    paint.setFont(font);
-
+    setPaintFont(paint);
     if (scrollables.empty()) {
         paint.setPen(getBackground());
         paint.setBrush(getBackground());
 	paint.drawRect(nonCacheRect);
     }

     }
 	
     paint.end();
 
     paint.begin(this);
+    setPaintFont(paint);
     if (e) paint.setClipRect(e->rect());
     if (!m_selectionCached) {
 	drawSelections(paint);
     }
     paint.end();