Changeset 8 for trunk/src/widgets/qlabel.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/widgets/qlabel.cpp (modified) (2 diffs)

trunk/src/widgets/qlabel.cpp

@@ -280 +280 @@
       ( ( textformat == AutoText ) && QStyleSheet::mightBeRichText(ltext) ) );
 #else
-    bool useRichText = TRUE;
+    bool useRichText = FALSE;
 #endif
 #ifndef QT_NO_ACCEL
@@ -711 +711 @@
 
         if ( x + w < cr.right() )
-            reg = reg.unite( QRect( x + w, cr.y(),  cr.right() - x - w, cr.height() ) );
+            reg = reg.unite( QRect( x + w, cr.y(),  cr.right() - x - w + 1, cr.height() ) );
         if ( y + h < cr.bottom() )
-            reg = reg.unite( QRect( cr.x(), y +  h, cr.width(), cr.bottom() - y - h ) );
+            reg = reg.unite( QRect( cr.x(), y +  h, cr.width(), cr.bottom() - y - h + 1 ) );
 
         erase( reg );