benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix segfault in generation of button positions

Browse Source
This commit is contained in:
lupoDharkael
2017-12-18 19:22:54 +01:00
parent a0fdb96e44
commit f9c3b858ae
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/capture/widget/buttonhandler.cpp
View File

@@ -252,13 +252,13 @@ void ButtonHandler::updatePosition(const QRect &selection,
if (elemsAtCorners > 1 && !horizontalBlocked && !oneHorizontalBlocked) {
addCounter += 2;
} else if ((elemsAtCorners == 1 &&
(!horizontalBlocked || oneHorizontalBlocked)) ||
(elemsAtCorners > 1 && oneHorizontalBlocked)) {
} else if ((elemsAtCorners >= 1 &&
(!horizontalBlocked || oneHorizontalBlocked))){
addCounter += 1;
}
QPoint center = QPoint(baseArea.center().x(),
baseArea.top() - (SEPARATION+baseHeight));
addCounter = qBound(0, addCounter, vecLength - elemIndicator);
if (addCounter == 1 + buttonsPerRow) {
if (blockedLeft) {
center.setX(center.x() + (baseWidth+SEPARATION)/2);
@@ -281,9 +281,6 @@ void ButtonHandler::updatePosition(const QRect &selection,
(vecLength - elemIndicator < buttonsPerCol) ?
vecLength - elemIndicator : buttonsPerCol;
if (vecLength - elemIndicator < buttonsPerCol) {
addCounter = vecLength - elemIndicator;
}
QPoint center = QPoint(baseArea.left() - (SEPARATION + baseWidth),
baseArea.center().y());
QVector<QPoint> positions = verticalPoints(center, addCounter, true);