mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Skip unprocessed key events. Updates #1408.

Browse source 
Originally committed to SVN as r6356.
This commit is contained in:
Thomas Goyne 2012-01-25 05:48:53 +00:00
parent 26c3e13340
commit f8c27feedb
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/src/audio_display.cpp
View file

@ -1164,7 +1164,8 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& 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 &)

3
aegisub/src/dialog_detached_video.cpp
View file

@ -120,7 +120,8 @@ void DialogDetachedVideo::OnMinimize(wxIconizeEvent &event) {
}
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() {

3
aegisub/src/video_display.cpp
View file

@ -388,7 +388,8 @@ void VideoDisplay::OnContextMenu(wxContextMenuEvent&) {
}
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) {

2
aegisub/src/video_slider.cpp
View file

@ -160,6 +160,8 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
c->subsGrid->GetEventHandler()->ProcessEvent(event);
c->subsGrid->SetFocus();
}
else
event.Skip();
}
void VideoSlider::OnPaint(wxPaintEvent &) {