]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/18.12'
authorNate Graham <nate@kde.org>
Sun, 17 Feb 2019 21:07:49 +0000 (14:07 -0700)
committerNate Graham <nate@kde.org>
Sun, 17 Feb 2019 21:07:49 +0000 (14:07 -0700)
1  2 
src/dolphinviewcontainer.cpp

index 0129081626a5dde1c08ccc257138406cab6be659,4d808d023b40f0d60f9a9e6bec49cf0ca0dc2357..767f2ae8f614041fa5cf6a59930c72bdcf78568c
@@@ -40,6 -40,7 +40,6 @@@
  #include <KShell>
  #include <KUrlComboBox>
  #include <KUrlNavigator>
 -#include <kio_version.h>
  
  #include <QDropEvent>
  #include <QLoggingCategory>
@@@ -311,6 -312,10 +311,10 @@@ void DolphinViewContainer::showMessage(
  
      m_messageWidget->setText(msg);
  
+     // TODO: wrap at arbitrary character positions once QLabel can do this
+     // https://bugreports.qt.io/browse/QTBUG-1276
+     m_messageWidget->setWordWrap(true);
      switch (type) {
      case Information: m_messageWidget->setMessageType(KMessageWidget::Information); break;
      case Warning:     m_messageWidget->setMessageType(KMessageWidget::Warning); break;