From 51df55edd78d6d4acf2086c8f8e7e7cab6446f88 Mon Sep 17 00:00:00 2001 From: Karl Blomster Date: Sun, 26 Apr 2009 04:31:19 +0000 Subject: [PATCH] Fix some more minor editbox regressions introduced in r2859. Patch by Harukalover, updates #794 Originally committed to SVN as r2861. --- aegisub/src/frame_main_events.cpp | 1 + aegisub/src/subs_edit_box.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp index 3be5f9a1c..da065072c 100644 --- a/aegisub/src/frame_main_events.cpp +++ b/aegisub/src/frame_main_events.cpp @@ -1639,6 +1639,7 @@ void FrameMain::OnEditBoxCommit(wxCommandEvent &event) { // Is the text edit if (focus == EditBox->TextEdit) { EditBox->Commit(true); + EditBox->Update(true); } // Other window diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp index 2743dd0b0..265eef327 100644 --- a/aegisub/src/subs_edit_box.cpp +++ b/aegisub/src/subs_edit_box.cpp @@ -267,8 +267,11 @@ void SubsEditBox::Update (bool timeOnly,bool weak) { int start = curdiag->Start.GetMS(); int end = curdiag->End.GetMS(); StartTime->SetTime(start); + StartTime->Update(); EndTime->SetTime(end); + EndTime->Update(); Duration->SetTime(end-start); + Duration->Update(); if (!timeOnly) { TextEdit->SetTextTo(curdiag->Text); Layer->SetValue(wxString::Format(_T("%i"),curdiag->Layer)); @@ -342,6 +345,8 @@ void SubsEditBox::SetToLine(int n,bool weak) { enabled = true; if (n != linen) { linen = n; + StartTime->Update(); + EndTime->Update(); Duration->Update(); } } @@ -912,10 +917,6 @@ void SubsEditBox::Commit(bool stay) { // Update file if (!updated && textNeedsCommit) { - if (StartTime->HasBeenModified() || EndTime->HasBeenModified()) { - StartTime->Update(); - EndTime->Update(); - } grid->ass->FlagAsModified(_("editing")); grid->CommitChanges(); }