comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-07 07:38:00 -04:00
Code Issues Projects Releases Wiki Activity

Don't let global key handler usurp the ModemProperties

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-05-19 19:23:56 -04:00
parent a1c7d0b5f8
commit 27ce295918
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AppFrame.cpp
View File

@ -1828,6 +1828,9 @@ int AppFrame::OnGlobalKeyDown(wxKeyEvent &event) {
if (!this->IsActive()) { if (!this->IsActive()) {
return -1; return -1;
} }
if (modemProps && (modemProps->HasFocus() || modemProps->isMouseInView())) {
return -1;
}
DemodulatorInstance *demod = nullptr, *lastDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator(); DemodulatorInstance *demod = nullptr, *lastDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
int snap = wxGetApp().getFrequencySnap(); int snap = wxGetApp().getFrequencySnap();
@ -1920,6 +1923,9 @@ int AppFrame::OnGlobalKeyUp(wxKeyEvent &event) {
if (!this->IsActive()) { if (!this->IsActive()) {
return -1; return -1;
} }
if (modemProps && (modemProps->HasFocus() || modemProps->isMouseInView())) {
return -1;
}
DemodulatorInstance *lastDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator(); DemodulatorInstance *lastDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator();

2
src/ModemProperties.cpp
View File

@ -175,5 +175,5 @@ void ModemProperties::OnMouseLeave(wxMouseEvent & /* event */) {
} }
bool ModemProperties::isMouseInView() { bool ModemProperties::isMouseInView() {
return mouseInView; return mouseInView || (m_propertyGrid && m_propertyGrid->IsEditorFocused());
} }