forked from mia/Aegisub
Skip unprocessed key events. Updates #1408.
Originally committed to SVN as r6356.
This commit is contained in:
parent
26c3e13340
commit
f8c27feedb
4 changed files with 8 additions and 3 deletions
|
@ -1164,7 +1164,8 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
|
||||||
|
|
||||||
void AudioDisplay::OnKeyDown(wxKeyEvent& event)
|
void AudioDisplay::OnKeyDown(wxKeyEvent& event)
|
||||||
{
|
{
|
||||||
hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
|
if (!hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
||||||
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioDisplay::OnSize(wxSizeEvent &)
|
void AudioDisplay::OnSize(wxSizeEvent &)
|
||||||
|
|
|
@ -120,7 +120,8 @@ void DialogDetachedVideo::OnMinimize(wxIconizeEvent &event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) {
|
void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) {
|
||||||
hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers());
|
if (!hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers()))
|
||||||
|
evt.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogDetachedVideo::OnVideoOpen() {
|
void DialogDetachedVideo::OnVideoOpen() {
|
||||||
|
|
|
@ -388,7 +388,8 @@ void VideoDisplay::OnContextMenu(wxContextMenuEvent&) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
|
void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
|
||||||
hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
|
if (!hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
|
||||||
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoDisplay::SetZoom(double value) {
|
void VideoDisplay::SetZoom(double value) {
|
||||||
|
|
|
@ -160,6 +160,8 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
|
||||||
c->subsGrid->GetEventHandler()->ProcessEvent(event);
|
c->subsGrid->GetEventHandler()->ProcessEvent(event);
|
||||||
c->subsGrid->SetFocus();
|
c->subsGrid->SetFocus();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VideoSlider::OnPaint(wxPaintEvent &) {
|
void VideoSlider::OnPaint(wxPaintEvent &) {
|
||||||
|
|
Loading…
Reference in a new issue