kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dolphin Places: Make it easier to drag and drop items

Browse source 
When doing a drop, a check is performed to see if it is within x pixels
from the top or x pixel from the bottom of the rect. If it is, then the
drop is considered a drop between items.

This x was fixed to qMax( 4, myStyleOption.padding ) which would
generally be 4. This is fine for some cases, but when the rectangle size
increases then this 4 pixels is not enough. Hence this 'x' is now being
set to 30% of the rectangle height.

By default the rectangle height is 20 pixels, so x is now 6 instead of 4
in the default case, which does make it slightly easier.

Also, this in-between-items check is only performed when moving from one
item to another. This is not good since if you enter the item and the
bottom, the indicator is shown, and then as to start moving it up it
stops showing, and then it should start showing again as you approach
the top edge.

Modified the code to run the check on every mouse drag event even if the
hovered item has not changed.

Both these changes combined make it much easier to drag and drop items.

REVIEW: 110342
This commit is contained in:
Vishesh Handa 2013-05-07 15:12:56 +05:30
parent 10857727ec
commit cc4947d1ac
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/kitemviews/kitemlistcontroller.cpp
View file

@ -838,6 +838,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
oldHoveredWidget->setHovered(false); oldHoveredWidget->setHovered(false);
emit itemUnhovered(oldHoveredWidget->index()); emit itemUnhovered(oldHoveredWidget->index());
} }
}
if (newHoveredWidget) { if (newHoveredWidget) {
bool droppingBetweenItems = false; bool droppingBetweenItems = false;
@ -847,17 +848,26 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
} }
const int index = newHoveredWidget->index(); const int index = newHoveredWidget->index();
if (!droppingBetweenItems && m_model->supportsDropping(index)) { if (!droppingBetweenItems) {
if (m_model->supportsDropping(index)) {
// Something has been dragged on an item. // Something has been dragged on an item.
m_view->hideDropIndicator(); m_view->hideDropIndicator();
if (!newHoveredWidget->isHovered()) {
newHoveredWidget->setHovered(true); newHoveredWidget->setHovered(true);
emit itemHovered(index); emit itemHovered(index);
}
if (m_autoActivationTimer->interval() >= 0) { if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) {
m_autoActivationTimer->setProperty("index", index); m_autoActivationTimer->setProperty("index", index);
m_autoActivationTimer->start(); m_autoActivationTimer->start();
} }
} }
} else {
m_autoActivationTimer->stop();
if (newHoveredWidget && newHoveredWidget->isHovered()) {
newHoveredWidget->setHovered(false);
emit itemUnhovered(index);
}
} }
} }

3
src/kitemviews/kitemlistview.cpp
View file

@ -2365,7 +2365,8 @@ int KItemListView::showDropIndicator(const QPointF& pos)
const QRectF rect = itemRect(widget->index()); const QRectF rect = itemRect(widget->index());
if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) { if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
if (m_model->supportsDropping(widget->index())) { if (m_model->supportsDropping(widget->index())) {
const int gap = qMax(4, m_styleOption.padding); // Keep 30% of the rectangle as the gap instead of always having a fixed gap
const int gap = qMax(4.0, 0.3 * rect.height());
if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) { if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) {
return -1; return -1;
} }