1) Make sure that size qprogressbar is really updated after each change

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index e33d94c18c74097f1c368cd6c54a88974127fc68..932efcb1e1dee735fde1300c30bb0a5eee5447af 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -46,6 +46,8 @@
 DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* controller) :
     QTreeView(parent),
        m_autoResize(true),
+    m_expandingTogglePressed(false),
+    m_keyPressed(false),
     m_controller(controller),
     m_selectionManager(0),
     m_font(),
@@ -187,6 +189,7 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 
     QTreeView::mousePressEvent(event);
 
+    m_expandingTogglePressed = false;
     const QModelIndex index = indexAt(event->pos());
     const bool updateState = index.isValid() &&
                              (index.column() == DolphinModel::Name) &&
@@ -197,17 +200,23 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
         const QRect rect = visualRect(index);
         if (event->pos().x() >= rect.x() + indentation()) {
             setState(QAbstractItemView::DraggingState);
+        } else {
+            m_expandingTogglePressed = true;
         }
     }
 
     if (!index.isValid() || (index.column() != DolphinModel::Name)) {
+        if (QApplication::mouseButtons() & Qt::MidButton) {
+            m_controller->replaceUrlByClipboard();
+        }
+
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         }
     }
 
-    if (event->button() == Qt::LeftButton) {
+    if ((event->button() == Qt::LeftButton) && !m_expandingTogglePressed) {
         m_showElasticBand = true;
 
         const QPoint pos(contentsPos());
@@ -248,11 +257,20 @@ void DolphinDetailsView::mouseMoveEvent(QMouseEvent* event)
         // QTreeView::mouseMoveEvent(event);
         QAbstractItemView::mouseMoveEvent(event);
     }
+
+    if (m_expandingTogglePressed) {
+        // Per default QTreeView starts either a selection or a drag operation when dragging
+        // the expanding toggle button (Qt-issue - see TODO comment in DolphinIconsView::mousePressEvent()).
+        // Turn off this behavior in Dolphin to stay predictable:
+        clearSelection();
+        setState(QAbstractItemView::NoState);
+    }
 }
 
 void DolphinDetailsView::mouseReleaseEvent(QMouseEvent* event)
 {
     QTreeView::mouseReleaseEvent(event);
+    m_expandingTogglePressed = false;
     if (m_showElasticBand) {
         updateElasticBand();
         m_showElasticBand = false;
@@ -347,6 +365,13 @@ void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
 {
     QTreeView::keyPressEvent(event);
     m_controller->handleKeyPressEvent(event);
+    m_keyPressed = true;
+}
+
+void DolphinDetailsView::keyReleaseEvent(QKeyEvent* event)
+{
+    QTreeView::keyReleaseEvent(event);
+    m_keyPressed = false;
 }
 
 void DolphinDetailsView::resizeEvent(QResizeEvent* event)
@@ -378,7 +403,7 @@ void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModel
 
     // Stay consistent with QListView: When changing the current index by key presses,
     // also change the selection.
-    if (QApplication::mouseButtons() == Qt::NoButton) {
+    if (m_keyPressed) {
         selectionModel()->select(current, QItemSelectionModel::ClearAndSelect);
     }
 }