From a3d7d2bbc074b9049e9494e9ac4035acafe609c6 Mon Sep 17 00:00:00 2001 From: cantabile Date: Mon, 28 May 2012 14:18:10 +0000 Subject: [PATCH] TimeEdit: handle Shift-Insert the same way as Ctrl-V Shift-Insert pasted the text anyway, but without anyone "noticing", which meant the TimeEdit's internal variable "time" didn't get updated, causing TimeEdit::GetTime() to return the old time. Because of this, pasting a time in the Jump To dialog with Shift-Insert didn't update the frame number. Originally committed to SVN as r6882. --- aegisub/src/timeedit_ctrl.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/aegisub/src/timeedit_ctrl.cpp b/aegisub/src/timeedit_ctrl.cpp index 11a621f85..74f090c3f 100644 --- a/aegisub/src/timeedit_ctrl.cpp +++ b/aegisub/src/timeedit_ctrl.cpp @@ -149,6 +149,14 @@ void TimeEdit::OnKeyDown(wxKeyEvent &event) { else event.Skip(); } + // Shift-Insert would paste the stuff anyway + // but no one updates the private "time" variable. + else if (event.ShiftDown()) { + if (key == WXK_INSERT) + PasteTime(); + else + event.Skip(); + } else { // Translate numpad presses to normal numbers if (key >= WXK_NUMPAD0 && key <= WXK_NUMPAD9)