Mercurial > hg > svgui

diff view/Pane.cpp @ 384:c1e5af9f2c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
...
author Chris Cannam
date Mon, 12 May 2008 12:38:59 +0000
parents 06b5f110c5d2
children c0818f064e66
line wrap: on
line diff
--- a/view/Pane.cpp	Fri May 09 12:39:02 2008 +0000
+++ b/view/Pane.cpp	Mon May 12 12:38:59 2008 +0000
@@ -974,8 +974,14 @@
         .arg(nativeRate)
         .arg(srNote);
 
-    if (r.x() < m_scaleWidth + 5 + paint.fontMetrics().width(desc)) {
-        drawVisibleText(paint, m_scaleWidth + 5,
+    int x = m_scaleWidth + 5;
+    int pbw = getProgressBarWidth();
+    if (x < pbw + 5) x = pbw + 5;
+
+    std::cerr << "x = " << x << ", pbw = " << pbw << std::endl;
+
+    if (r.x() < x + paint.fontMetrics().width(desc)) {
+        drawVisibleText(paint, x,
                         height() - fontHeight + fontAscent - 6,
                         desc, OutlinedText);
     }