X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7a2f5990eeac75821d9baf937fb1253e197de8da..817f3952e2bed820ea3b50dfdfe91ccb99dcb748:/src/sidebartreeview.cpp diff --git a/src/sidebartreeview.cpp b/src/sidebartreeview.cpp index 5ac3b0cbf..3018737ab 100644 --- a/src/sidebartreeview.cpp +++ b/src/sidebartreeview.cpp @@ -30,8 +30,7 @@ #include SidebarTreeView::SidebarTreeView(QWidget* parent) : - QTreeView(parent), - m_dragging(false) + KTreeView(parent) { setAcceptDrops(true); setUniformRowHeights(true); @@ -41,7 +40,6 @@ SidebarTreeView::SidebarTreeView(QWidget* parent) : setFrameStyle(QFrame::NoFrame); setDragDropMode(QAbstractItemView::DragDrop); setDropIndicatorShown(false); - setAutoExpandDelay(300); setVerticalScrollMode(QListView::ScrollPerPixel); setHorizontalScrollMode(QListView::ScrollPerPixel); @@ -80,11 +78,8 @@ bool SidebarTreeView::event(QEvent* event) verticalScrollBar()->setSingleStep(sizeHintForRow(0) / 3); } } - else if (event->type() == QEvent::MetaCall) { - resizeColumnToContents(DolphinModel::Name); - } - return QTreeView::event(event); + return KTreeView::event(event); } void SidebarTreeView::startDrag(Qt::DropActions supportedActions) @@ -94,27 +89,21 @@ void SidebarTreeView::startDrag(Qt::DropActions supportedActions) void SidebarTreeView::dragEnterEvent(QDragEnterEvent* event) { - QTreeView::dragEnterEvent(event); - + KTreeView::dragEnterEvent(event); if (event->mimeData()->hasUrls()) { event->acceptProposedAction(); } - - m_dragging = true; } void SidebarTreeView::dragLeaveEvent(QDragLeaveEvent* event) { - QTreeView::dragLeaveEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - m_dragging = false; + KTreeView::dragLeaveEvent(event); setDirtyRegion(m_dropRect); } void SidebarTreeView::dragMoveEvent(QDragMoveEvent* event) { - QTreeView::dragMoveEvent(event); + KTreeView::dragMoveEvent(event); // TODO: remove this code when the issue #160611 is solved in Qt 4.4 const QModelIndex index = indexAt(event->pos()); @@ -132,7 +121,7 @@ void SidebarTreeView::dropEvent(QDropEvent* event) { const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); if (urls.isEmpty()) { - QTreeView::dropEvent(event); + KTreeView::dropEvent(event); } else { event->acceptProposedAction(); const QModelIndex index = indexAt(event->pos()); @@ -140,18 +129,6 @@ void SidebarTreeView::dropEvent(QDropEvent* event) emit urlsDropped(urls, index); } } - m_dragging = false; -} - -void SidebarTreeView::paintEvent(QPaintEvent* event) -{ - QTreeView::paintEvent(event); - - // TODO: remove this code when the issue #160611 is solved in Qt 4.4 - if (m_dragging) { - const QBrush& brush = palette().brush(QPalette::Normal, QPalette::Highlight); - DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush); - } } #include "sidebartreeview.moc"