iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issues with selected line styles with the keyboard on OS X 

Opening the style list dropdown and switching between values with the
arrow keys doesn't update the value returned from ctrl->GetValue() on
OS X, but the event contains the correct value so use that instread.
This commit is contained in:
Thomas Goyne 2014-06-05 07:18:12 -07:00
parent 238110e799
commit 50dfa1cd42
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/subs_edit_box.cpp
View File

@ -578,8 +578,8 @@ void SubsEditBox::OnSplit(wxCommandEvent&) {
secondary_editor->SetValue(to_wx(c->initialLineState->GetInitialText())); secondary_editor->SetValue(to_wx(c->initialLineState->GetInitialText()));
} }
void SubsEditBox::OnStyleChange(wxCommandEvent &) { void SubsEditBox::OnStyleChange(wxCommandEvent &evt) {
SetSelectedRows(&AssDialogue::Style, style_box->GetValue(), _("style change"), AssFile::COMMIT_DIAG_META); SetSelectedRows(&AssDialogue::Style, evt.GetString(), _("style change"), AssFile::COMMIT_DIAG_META);
active_style = c->ass->GetStyle(line->Style); active_style = c->ass->GetStyle(line->Style);
} }
@ -589,18 +589,18 @@ void SubsEditBox::OnActorChange(wxCommandEvent &evt) {
PopulateList(actor_box, &AssDialogue::Actor); PopulateList(actor_box, &AssDialogue::Actor);
} }
void SubsEditBox::OnLayerEnter(wxCommandEvent &) { void SubsEditBox::OnLayerEnter(wxCommandEvent &evt) {
SetSelectedRows(&AssDialogue::Layer, layer->GetValue(), _("layer change"), AssFile::COMMIT_DIAG_META); SetSelectedRows(&AssDialogue::Layer, evt.GetInt(), _("layer change"), AssFile::COMMIT_DIAG_META);
} }
void SubsEditBox::OnEffectChange(wxCommandEvent &evt) { void SubsEditBox::OnEffectChange(wxCommandEvent &evt) {
bool amend = evt.GetEventType() == wxEVT_TEXT; bool amend = evt.GetEventType() == wxEVT_TEXT;
SetSelectedRows(&AssDialogue::Effect, effect_box->GetValue(), _("effect change"), AssFile::COMMIT_DIAG_META, amend); SetSelectedRows(&AssDialogue::Effect, evt.GetString(), _("effect change"), AssFile::COMMIT_DIAG_META, amend);
PopulateList(effect_box, &AssDialogue::Effect); PopulateList(effect_box, &AssDialogue::Effect);
} }
void SubsEditBox::OnCommentChange(wxCommandEvent &) { void SubsEditBox::OnCommentChange(wxCommandEvent &evt) {
SetSelectedRows(&AssDialogue::Comment, comment_box->GetValue(), _("comment change"), AssFile::COMMIT_DIAG_META); SetSelectedRows(&AssDialogue::Comment, !!evt.GetInt(), _("comment change"), AssFile::COMMIT_DIAG_META);
} }
void SubsEditBox::CallCommand(const char *cmd_name) { void SubsEditBox::CallCommand(const char *cmd_name) {