kstandarditemlistwidget: render overlays in paint

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 99b7a4042377142439d1282545ea90ca12f82a05..dcf159cda1fc4e9d01406bf9a7ead203d0c1ce2e 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -942,7 +942,12 @@ void DolphinViewContainer::startSearching()
     const QUrl url = m_searchBox->urlForSearching();
     if (url.isValid() && !url.isEmpty()) {
         m_view->setViewPropertiesContext(QStringLiteral("search"));
     const QUrl url = m_searchBox->urlForSearching();
     if (url.isValid() && !url.isEmpty()) {
         m_view->setViewPropertiesContext(QStringLiteral("search"));

-        m_urlNavigatorConnected->setLocationUrl(url);
+        // If we open a new tab that has a search assigned to it, we can't
+        // update the urlNavigator, since there is none connected to that tab.
+        // See BUG:500101
+        if (m_urlNavigatorConnected) {
+            m_urlNavigatorConnected->setLocationUrl(url);
+        }

     }
 }
 
     }
 }
 


@@ -1111,17 +1116,10 @@ bool DolphinViewContainer::eventFilter(QObject *object, QEvent *event)
 
 QRect DolphinViewContainer::preferredSmallStatusBarGeometry()
 {
 
 QRect DolphinViewContainer::preferredSmallStatusBarGeometry()
 {

-    // Add offset depending if horizontal scrollbar or filterbar is visible.
-    int filterBarHeightOffset = 0;
-    int scrollbarHeightOffset = m_view->horizontalScrollBarHeight();
-
-    if (m_filterBar->isVisible()) {
-        filterBarHeightOffset = m_filterBar->height();
-    }
-

     // Adjust to clipping, we need to add 1 due to how QRects coordinates work.
     int clipAdjustment = m_statusBar->clippingAmount() + 1;
     // Adjust to clipping, we need to add 1 due to how QRects coordinates work.
     int clipAdjustment = m_statusBar->clippingAmount() + 1;

-    const int yPos = rect().bottom() - m_statusBar->minimumHeight() - scrollbarHeightOffset - filterBarHeightOffset + clipAdjustment;
+    // Add offset depending if horizontal scrollbar or filterbar is visible.
+    const int yPos = m_view->geometry().bottom() - m_view->horizontalScrollBarHeight() - m_statusBar->minimumHeight() + clipAdjustment;

     QRect statusBarRect = rect().adjusted(-clipAdjustment, yPos, 0, 0);
     return statusBarRect;
 }
     QRect statusBarRect = rect().adjusted(-clipAdjustment, yPos, 0, 0);
     return statusBarRect;
 }