Prevent solo-squelch focus from interrupting user actions; acts as temporary hold as well

This commit is contained in:
Charles J. Cliffe
2016-08-16 17:55:40 -04:00
parent ad7779de53
commit 6ede20c3e8
6 changed files with 26 additions and 3 deletions
+8
View File
@@ -183,3 +183,11 @@ void InteractiveCanvas::OnMouseRightDown(wxMouseEvent& event) {
void InteractiveCanvas::OnMouseRightReleased(wxMouseEvent& event) {
mouseTracker.OnMouseRightReleased(event);
}
bool InteractiveCanvas::isMouseInView() {
return mouseTracker.mouseInView();
}
bool InteractiveCanvas::isMouseDown() {
return mouseTracker.mouseInView() && mouseTracker.mouseDown();
}
+3 -1
View File
@@ -25,7 +25,9 @@ public:
unsigned int getBandwidth();
MouseTracker *getMouseTracker();
bool isMouseInView();
bool isMouseDown();
bool isAltDown();
bool isCtrlDown();
bool isShiftDown();
+1
View File
@@ -730,6 +730,7 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
demod->run();
wxGetApp().bindDemodulator(demod);
DemodulatorThread::releaseSquelchLock(nullptr);
}
if (!demod) {