vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash on dragging titlebar buttons in System Settings 

Summary:
Currently, if user tries to move one of buttons to the left, ending up
dragging one button onto another, crash occurs.

In addition, this patch replaces verbose replacement(remove/insert) with
more elegant QVector<T>::move(int, int)

BUG: 374153
FIXED-IN: 5.8.7

Reviewers: graesslin, #kwin

Reviewed By: graesslin, #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D5117
icc-effect-5.14.5
Vladyslav Tronko 2017-03-24 16:57:43 +01:00 committed by David Edmundson
parent c3362fe866
commit 1bfe1164f4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp
View File

@ -162,8 +162,18 @@ void ButtonsModel::move(int sourceIndex, int targetIndex)
if (sourceIndex == qMax(0, targetIndex)) {
return;
}
beginMoveRows(QModelIndex(), sourceIndex, sourceIndex, QModelIndex(), targetIndex + 1);
m_buttons.insert(qMax(0, targetIndex), m_buttons.takeAt(sourceIndex));
/* When moving an item down, the destination index needs to be incremented
by one, as explained in the documentation:
http://doc.qt.nokia.com/qabstractitemmodel.html#beginMoveRows */
if (targetIndex > sourceIndex) {
// Row will be moved down
beginMoveRows(QModelIndex(), sourceIndex, sourceIndex, QModelIndex(), targetIndex + 1);
} else {
beginMoveRows(QModelIndex(), sourceIndex, sourceIndex, QModelIndex(), qMax(0, targetIndex));
}
m_buttons.move(sourceIndex, qMax(0, targetIndex));
endMoveRows();
}