Merge remote-tracking branch 'origin/Applications/19.04'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 0129081626a5dde1c08ccc257138406cab6be659..cdce157eb989e9bd95829e08fdd5b39d10b712a5 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -71,12 +71,12 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
-    m_topLayout->setMargin(0);
+    m_topLayout->setContentsMargins(0, 0, 0, 0);
 
     m_navigatorWidget = new QWidget(this);
     QHBoxLayout* navigatorLayout = new QHBoxLayout(m_navigatorWidget);
     navigatorLayout->setSpacing(0);
-    navigatorLayout->setMargin(0);
+    navigatorLayout->setContentsMargins(0, 0, 0, 0);
 
     m_urlNavigator = new KUrlNavigator(DolphinPlacesModelSingleton::instance().placesModel(), url, this);
     connect(m_urlNavigator, &KUrlNavigator::activated,
@@ -311,6 +311,10 @@ void DolphinViewContainer::showMessage(const QString& msg, MessageType type)
 
     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;