Fixes Bug 305783 - dragging a file over a directory #c4

does not expand the dir => Bug discovered: When you drag a
     item onto a folder-view-item and then move it away
     instantly before the autoactivation event is triggered
     (After 750ms), the folder will be opened anyway.

BUG: 305783
REVIEW: 106381
FIXED-IN: 4.9.2
(cherry picked from commit 9ab8bcd6aa)
This commit is contained in:
Emmanuel Pescosta 2012-09-12 19:33:28 +02:00
parent a740120fe1
commit c330be5f5c

View file

@ -489,7 +489,16 @@ void KItemListController::slotAutoActivationTimeout()
return;
}
if (m_model->supportsDropping(index)) {
/* m_view->isUnderMouse() fixes a bug in the Folder-View-Panel and in the
* Places-Panel.
*
* Bug: When you drag a file onto a Folder-View-Item or a Places-Item and
* then move away before the auto-activation timeout triggers, than the
* item still becomes activated/expanded.
*
* See Bug 293200 and 305783
*/
if (m_model->supportsDropping(index) && m_view->isUnderMouse()) {
if (m_view->supportsItemExpanding() && m_model->isExpandable(index)) {
const bool expanded = m_model->isExpanded(index);
m_model->setExpanded(index, !expanded);