X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7a2f5990eeac75821d9baf937fb1253e197de8da..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/dolphindetailsview.cpp diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 11b993849..53bf4e2a7 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -49,7 +49,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr m_controller(controller), m_font(), m_decorationSize(), - m_dragging(false), m_showElasticBand(false), m_elasticBandOrigin(), m_elasticBandDestination() @@ -69,7 +68,6 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr setItemsExpandable(settings->expandableFolders()); setMouseTracking(true); - viewport()->setAttribute(Qt::WA_Hover); const ViewProperties props(controller->url()); setSortIndicatorSection(props.sorting()); @@ -261,15 +259,11 @@ void DolphinDetailsView::dragEnterEvent(QDragEnterEvent* event) updateElasticBand(); m_showElasticBand = false; } - m_dragging = true; } void DolphinDetailsView::dragLeaveEvent(QDragLeaveEvent* event) { QTreeView::dragLeaveEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - m_dragging = false; setDirtyRegion(m_dropRect); } @@ -280,10 +274,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event) // TODO: remove this code when the issue #160611 is solved in Qt 4.4 setDirtyRegion(m_dropRect); const QModelIndex index = indexAt(event->pos()); - if (!index.isValid() || (index.column() != DolphinModel::Name)) { - m_dragging = false; - } else { - m_dragging = true; + if (index.isValid() && (index.column() == DolphinModel::Name)) { const KFileItem item = m_controller->itemForIndex(index); if (!item.isNull() && item.isDir()) { m_dropRect = visualRect(index); @@ -314,7 +305,6 @@ void DolphinDetailsView::dropEvent(QDropEvent* event) item); } QTreeView::dropEvent(event); - m_dragging = false; } void DolphinDetailsView::paintEvent(QPaintEvent* event) @@ -335,12 +325,6 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event) style()->drawControl(QStyle::CE_RubberBand, &opt, &painter); painter.restore(); } - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - if (m_dragging) { - const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight); - DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush); - } } void DolphinDetailsView::keyPressEvent(QKeyEvent* event)