mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Dolphin Places: Make it easier to drag and drop items
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:
parent
10857727ec
commit
cc4947d1ac
|
@ -838,26 +838,36 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons
|
|||
oldHoveredWidget->setHovered(false);
|
||||
emit itemUnhovered(oldHoveredWidget->index());
|
||||
}
|
||||
}
|
||||
|
||||
if (newHoveredWidget) {
|
||||
bool droppingBetweenItems = false;
|
||||
if (m_model->sortRole().isEmpty()) {
|
||||
// The model supports inserting items between other items.
|
||||
droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0);
|
||||
}
|
||||
if (newHoveredWidget) {
|
||||
bool droppingBetweenItems = false;
|
||||
if (m_model->sortRole().isEmpty()) {
|
||||
// The model supports inserting items between other items.
|
||||
droppingBetweenItems = (m_view->showDropIndicator(pos) >= 0);
|
||||
}
|
||||
|
||||
const int index = newHoveredWidget->index();
|
||||
if (!droppingBetweenItems && m_model->supportsDropping(index)) {
|
||||
const int index = newHoveredWidget->index();
|
||||
if (!droppingBetweenItems) {
|
||||
if (m_model->supportsDropping(index)) {
|
||||
// Something has been dragged on an item.
|
||||
m_view->hideDropIndicator();
|
||||
newHoveredWidget->setHovered(true);
|
||||
emit itemHovered(index);
|
||||
if (!newHoveredWidget->isHovered()) {
|
||||
newHoveredWidget->setHovered(true);
|
||||
emit itemHovered(index);
|
||||
}
|
||||
|
||||
if (m_autoActivationTimer->interval() >= 0) {
|
||||
if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) {
|
||||
m_autoActivationTimer->setProperty("index", index);
|
||||
m_autoActivationTimer->start();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
m_autoActivationTimer->stop();
|
||||
if (newHoveredWidget && newHoveredWidget->isHovered()) {
|
||||
newHoveredWidget->setHovered(false);
|
||||
emit itemUnhovered(index);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2365,7 +2365,8 @@ int KItemListView::showDropIndicator(const QPointF& pos)
|
|||
const QRectF rect = itemRect(widget->index());
|
||||
if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
|
||||
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) {
|
||||
return -1;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue