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

Fix negative selection geometry bug

Browse Source 
normalize only swaps the sides if width() or height() is < 0,
but we need it to happen when it is <=0 because with QRect's
normalized method we get negative geometry and that causes a bug
when we position the buttons.
This commit is contained in:
lupoDharkael
2018-05-17 22:14:02 +02:00
parent 12faddff8b
commit a8bb555c12
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/capture/capturewidget.cpp
View File

@@ -439,10 +439,22 @@ void CaptureWidget::mouseReleaseEvent(QMouseEvent *e) {
// of a new one.
if (!m_buttonHandler->isVisible() && m_selection->isVisible()) {
// Don't go outside
m_selection->setGeometry(m_selection->geometry().intersected(rect()));
m_context.selection = m_selection->geometry(); // TODO remove?
QRect newGeometry = m_selection->geometry().intersected(rect());
// normalize
if (newGeometry.width() <= 0) {
int left = newGeometry.left();
newGeometry.setLeft(newGeometry.right());
newGeometry.setRight(left);
}
if (newGeometry.height() <= 0) {
int top = newGeometry.top();
newGeometry.setTop(newGeometry.bottom());
newGeometry.setBottom(top);
}
m_selection->setGeometry(newGeometry);
m_context.selection = newGeometry;
updateSizeIndicator();
m_buttonHandler->updatePosition(m_selection->geometry());
m_buttonHandler->updatePosition(newGeometry);
m_buttonHandler->show();
}
m_mouseIsClicked = false;