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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/dialogs
From:       Christoph Feck <christoph () maxiom ! de>
Date:       2010-06-16 1:48:34
Message-ID: 20100616014834.ACEE3AC8D4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1138417 by cfeck:

Fix KMessageBox cropping last line on longer texts

This works around QTBUG-11457 by first setting
textInteractionFlags, then getting sizeHint.


 M  +9 -5      kmessagebox.cpp  


--- trunk/KDE/kdelibs/kdeui/dialogs/kmessagebox.cpp #1138416:1138417
@@ -184,6 +184,13 @@
     hLayout->addSpacing(KDialog::spacingHint());
 
     QLabel *messageLabel = new QLabel(text, mainWidget);
+    messageLabel->setOpenExternalLinks(options & KMessageBox::AllowLink);
+    Qt::TextInteractionFlags flags = Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard;
+    if (options & KMessageBox::AllowLink) {
+        flags |= Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard;
+    }
+    messageLabel->setTextInteractionFlags(flags);
+
     QRect desktop = KGlobalSettings::desktopGeometry(dialog);
     bool usingSqueezedTextLabel = false;
     if (messageLabel->sizeHint().width() > desktop.width() * 0.5) {
@@ -195,14 +202,11 @@
         {
             delete messageLabel;
             messageLabel = new KSqueezedTextLabel(text, mainWidget);
+            messageLabel->setOpenExternalLinks(options & KMessageBox::AllowLink);
+            messageLabel->setTextInteractionFlags(flags);
         }
     }
 
-    messageLabel->setOpenExternalLinks(options & KMessageBox::AllowLink );
-    Qt::TextInteractionFlags flags = Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard;
-    if ( options & KMessageBox::AllowLink )
-        flags |= Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard;;
-    messageLabel->setTextInteractionFlags(flags);
     QPalette messagePal(messageLabel->palette());
     messagePal.setColor(QPalette::Window, Qt::transparent);
     messageLabel->setPalette(messagePal);
[prev in list] [next in list] [prev in thread] [next in thread]