mirror of https://github.com/odrling/Aegisub
Hopefully fixed the behaviour of layer spin control.
Originally committed to SVN as r1635.
This commit is contained in:
parent
268ee2b8af
commit
53fe61c546
|
@ -362,7 +362,7 @@ BEGIN_EVENT_TABLE(SubsEditBox, wxPanel)
|
|||
EVT_COMBOBOX(STYLE_COMBOBOX, SubsEditBox::OnStyleChange)
|
||||
EVT_COMBOBOX(ACTOR_COMBOBOX, SubsEditBox::OnActorChange)
|
||||
EVT_TEXT_ENTER(ACTOR_COMBOBOX, SubsEditBox::OnActorChange)
|
||||
//EVT_TEXT_ENTER(LAYER_BOX, SubsEditBox::OnLayerChange)
|
||||
EVT_TEXT_ENTER(LAYER_BOX, SubsEditBox::OnLayerEnter)
|
||||
EVT_SPINCTRL(LAYER_BOX, SubsEditBox::OnLayerChange)
|
||||
EVT_TEXT_ENTER(STARTTIME_BOX, SubsEditBox::OnStartTimeChange)
|
||||
EVT_TEXT_ENTER(ENDTIME_BOX, SubsEditBox::OnEndTimeChange)
|
||||
|
@ -595,8 +595,8 @@ void SubsEditBox::OnActorChange(wxCommandEvent &event) {
|
|||
}
|
||||
|
||||
|
||||
/////////////////
|
||||
// Layer changed
|
||||
///////////////////////////
|
||||
// Layer changed with spin
|
||||
void SubsEditBox::OnLayerChange(wxSpinEvent &event) {
|
||||
// Value
|
||||
long temp = event.GetPosition();
|
||||
|
@ -616,7 +616,32 @@ void SubsEditBox::OnLayerChange(wxSpinEvent &event) {
|
|||
}
|
||||
|
||||
// Done
|
||||
Layer->SetValue(wxString::Format(_T("%i"),temp));
|
||||
grid->ass->FlagAsModified(_("layer change"));
|
||||
grid->CommitChanges();
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////
|
||||
// Layer changed with enter
|
||||
void SubsEditBox::OnLayerEnter(wxCommandEvent &event) {
|
||||
// Value
|
||||
long temp = Layer->GetValue();
|
||||
|
||||
// Get selection
|
||||
wxArrayInt sel = grid->GetSelection();
|
||||
|
||||
// Update
|
||||
int n = sel.Count();
|
||||
AssDialogue *cur;
|
||||
for (int i=0;i<n;i++) {
|
||||
cur = grid->GetDialogue(sel[i]);
|
||||
if (cur) {
|
||||
cur->Layer = temp;
|
||||
cur->UpdateData();
|
||||
}
|
||||
}
|
||||
|
||||
// Done
|
||||
grid->ass->FlagAsModified(_("layer change"));
|
||||
grid->CommitChanges();
|
||||
}
|
||||
|
|
|
@ -131,6 +131,7 @@ private:
|
|||
void OnKeyDown(wxStyledTextEvent &event);
|
||||
void OnStyleChange(wxCommandEvent &event);
|
||||
void OnActorChange(wxCommandEvent &event);
|
||||
void OnLayerEnter(wxCommandEvent &event);
|
||||
void OnLayerChange(wxSpinEvent &event);
|
||||
void OnStartTimeChange(wxCommandEvent &event);
|
||||
void OnEndTimeChange(wxCommandEvent &event);
|
||||
|
|
Loading…
Reference in New Issue