Skip to content

Commit 735dc66

Browse files
committed
Always disable pixel selection during navigation
1 parent 29c0bc0 commit 735dc66

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/ScatterplotWidget.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,27 @@ bool ScatterplotWidget::event(QEvent* event)
156156
if (event->type() == QEvent::KeyRelease)
157157
{
158158
if (const auto* keyEvent = static_cast<QKeyEvent*>(event))
159+
{
159160
if (keyEvent->key() == Qt::Key_Alt)
161+
{
160162
_isNavigating = false;
163+
_pixelSelectionTool.setEnabled(true);
164+
_samplerPixelSelectionTool.setEnabled(true);
165+
}
166+
}
161167

162168
}
163169
else if (event->type() == QEvent::KeyPress)
164170
{
165171
if (const auto* keyEvent = static_cast<QKeyEvent*>(event))
172+
{
166173
if (keyEvent->key() == Qt::Key_Alt)
174+
{
167175
_isNavigating = true;
176+
_pixelSelectionTool.setEnabled(false);
177+
_samplerPixelSelectionTool.setEnabled(false);
178+
}
179+
}
168180

169181
}
170182

@@ -192,7 +204,6 @@ bool ScatterplotWidget::event(QEvent* event)
192204
// Navigation
193205
if (mouseEvent->buttons() == Qt::LeftButton)
194206
{
195-
_pixelSelectionTool.setEnabled(false);
196207
setCursor(Qt::ClosedHandCursor);
197208
_mousePositions << mouseEvent->pos();
198209
update();
@@ -204,7 +215,6 @@ bool ScatterplotWidget::event(QEvent* event)
204215

205216
case QEvent::MouseButtonRelease:
206217
{
207-
_pixelSelectionTool.setEnabled(true);
208218
setCursor(Qt::ArrowCursor);
209219
_mousePositions.clear();
210220
update();

0 commit comments

Comments
 (0)