[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok
From:       Stefan Siegel <kde () sdas ! de>
Date:       2005-02-25 0:03:31
Message-ID: 20050225000331.387D2EDBC () office ! kde ! org
[Download RAW message or body]

CVS commit by siegel: 

This is a workaround for Qt issue N67674. The boundingRect() might not be wide enough \
                for a subsequent drawText() call, so the text doesn't fit correctly.
BUG: 100138
CCMAIL: amarok-devel@lists.sf.net


  M +0 -2      TODO   1.646
  M +4 -0      src/osd.cpp   1.102


--- kdeextragear-1/amarok/src/osd.cpp  #1.101:1.102
@@ -21,4 +21,5 @@
 #include <qbitmap.h>
 #include <qpainter.h>
+#include <qregexp.h>
 #include <qtimer.h>
 
@@ -103,4 +104,7 @@ OSDWidget::determineMetrics( const uint 
     const QSize max = QApplication::desktop()->screen( m_screen )->size() - margin;
 
+    // If we don't do that, the boundingRect() might not be suitable for drawText() \
(Qt issue N67674) +    m_text.replace( QRegExp(" +\n"), "\n" ); 
+
     // The osd cannot be larger than the screen
     QRect rect = fontMetrics().boundingRect( 0, 0,

--- kdeextragear-1/amarok/TODO  #1.645:1.646
@@ -7,6 +7,4 @@
 SHORT-TERM (URGENT):
 
-  <markey> The OSD freaks out when the text is too long, e.g. with streams.
-
   <mxcl>   Changing the title track to "" does such things as I cannot figure out, \
                it appears to work, but
            perhaps the collection isn't updated, or maybe the tag, or both. Can't \
tell.


[prev in list] [next in list] [prev in thread] [next in thread]