fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in button repositioning

Browse Source
This commit is contained in:
lupoDharkael
2017-05-16 00:30:45 +02:00
parent d09923790e
commit ad31f93f29
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
capture/buttonhandler.cpp
View File

@@ -128,12 +128,13 @@ void ButtonHandler::updatePosition(const QRect &selection,
} }
break; break;
} }
// number of buttons per row column
int buttonsPerRow = (baseArea.width() + SEPARATION) / (baseWidth + SEPARATION); int buttonsPerRow = (baseArea.width() + SEPARATION) / (baseWidth + SEPARATION);
int buttonsPerCol = (baseArea.height() + SEPARATION) / (baseHeight + SEPARATION); int buttonsPerCol = (baseArea.height() + SEPARATION) / (baseHeight + SEPARATION);
// buttons to be placed in the corners
int extraButtons = vecLength - buttonsPerRow*2 - buttonsPerCol*2; int extraButtons = vecLength - buttonsPerRow*2 - buttonsPerCol*2;
int elemsAtCorners = extraButtons > 4 ? 4 : extraButtons; int elemsAtCorners = extraButtons > 4 ? 4 : extraButtons;
// add buttons at the botton of the seletion
if (!blockedBotton) { if (!blockedBotton) {
int addCounter = int addCounter =
(vecLength - elemIndicator < buttonsPerRow) ? (vecLength - elemIndicator < buttonsPerRow) ?
@@ -161,6 +162,7 @@ void ButtonHandler::updatePosition(const QRect &selection,
++elemIndicator; ++elemIndicator;
} }
} }
// add buttons at the right side of the seletion
if (!blockedRight && elemIndicator < vecLength) { if (!blockedRight && elemIndicator < vecLength) {
int addCounter = int addCounter =
(vecLength - elemIndicator < buttonsPerCol) ? (vecLength - elemIndicator < buttonsPerCol) ?
@@ -174,6 +176,7 @@ void ButtonHandler::updatePosition(const QRect &selection,
++elemIndicator; ++elemIndicator;
} }
} }
// add buttons at the top of the seletion
if (!blockedTop && elemIndicator < vecLength) { if (!blockedTop && elemIndicator < vecLength) {
int addCounter = int addCounter =
(vecLength - elemIndicator < buttonsPerRow) ? (vecLength - elemIndicator < buttonsPerRow) ?
@@ -201,12 +204,13 @@ void ButtonHandler::updatePosition(const QRect &selection,
++elemIndicator; ++elemIndicator;
} }
} }
// add buttons at the left side of the seletion
if (!blockedLeft && elemIndicator < vecLength) { if (!blockedLeft && elemIndicator < vecLength) {
int addCounter = int addCounter =
(vecLength - elemIndicator < buttonsPerCol) ? (vecLength - elemIndicator < buttonsPerCol) ?
vecLength - elemIndicator : buttonsPerCol; vecLength - elemIndicator : buttonsPerCol;
if (vecLength - elemIndicator < buttonsPerRow) { if (vecLength - elemIndicator < buttonsPerCol) {
addCounter = vecLength - elemIndicator; addCounter = vecLength - elemIndicator;
} }
QPoint center = QPoint(baseArea.left() - (SEPARATION+baseWidth), QPoint center = QPoint(baseArea.left() - (SEPARATION+baseWidth),